[metrics] Refactor reporting
Bug: 170149255
Test: m test-art-host-gtest-art_libartbase_tests
Change-Id: Ic02dd94f55fb782e1ffb59789bf95e7f53f1f8e8
diff --git a/runtime/verifier/method_verifier_test.cc b/runtime/verifier/method_verifier_test.cc
index d7e193c..2e69b35 100644
--- a/runtime/verifier/method_verifier_test.cc
+++ b/runtime/verifier/method_verifier_test.cc
@@ -17,10 +17,11 @@
#include "method_verifier.h"
#include <stdio.h>
+
#include <memory>
#include "android-base/strings.h"
-
+#include "base/metrics_test.h"
#include "base/utils.h"
#include "class_linker-inl.h"
#include "class_verifier.h"
@@ -32,6 +33,8 @@
namespace art {
namespace verifier {
+using metrics::test::CounterValue;
+
class MethodVerifierTest : public CommonRuntimeTest {
protected:
void VerifyClass(const std::string& descriptor)
@@ -75,9 +78,10 @@
TEST_F(MethodVerifierTest, VerificationTimeMetrics) {
ScopedObjectAccess soa(Thread::Current());
ASSERT_TRUE(java_lang_dex_file_ != nullptr);
- const uint64_t original_time = GetMetrics()->ClassVerificationTotalTime()->Value();
+ auto* class_verification_total_time = GetMetrics()->ClassVerificationTotalTime();
+ const uint64_t original_time = CounterValue(*class_verification_total_time);
VerifyDexFile(*java_lang_dex_file_);
- ASSERT_GT(GetMetrics()->ClassVerificationTotalTime()->Value(), original_time);
+ ASSERT_GT(CounterValue(*class_verification_total_time), original_time);
}
} // namespace verifier