Refactor Metrics

chrome/browser/performance_monitor/performance_monitor_browsertest.cc

Index: chrome/browser/performance_monitor/performance_monitor_browsertest.cc
diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
index 3d0234cefc8b4a2a30da6a4eeef673fdc17a1c35..da744c02bfc67dcd7c566bd5557c0bafd1b30f3a 100644
--- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
+++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/performance_monitor/constants.h"
 #include "chrome/browser/performance_monitor/database.h"
+#include "chrome/browser/performance_monitor/metric.h"
 #include "chrome/browser/performance_monitor/performance_monitor.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
@@ -205,7 +206,7 @@ class PerformanceMonitorBrowserTest : public ExtensionBrowserTest {
     return events;
   }
 
-  void GetStatsOnBackgroundThread(Database::MetricInfoVector* metrics,
+  void GetStatsOnBackgroundThread(std::vector<Metric>* metrics,
                                   MetricType type) {
     *metrics = performance_monitor_->database()->GetStatsForActivityAndMetric(
         type, base::Time(), base::Time::FromInternalValue(kint64max));
@@ -213,11 +214,11 @@ class PerformanceMonitorBrowserTest : public ExtensionBrowserTest {
 
   // A handle for getting statistics from the database (see previous comments on
   // GetEvents() and GetEventsOnBackgroundThread).
-  Database::MetricInfoVector GetStats(MetricType type) {
+  std::vector<Metric> GetStats(MetricType type) {
     content::BrowserThread::GetBlockingPool()->FlushForTesting();
     content::RunAllPendingInMessageLoop();
 
-    Database::MetricInfoVector metrics;
+    std::vector<Metric> metrics;
     content::BrowserThread::PostBlockingPoolSequencedTask(
         Database::kDatabaseSequenceToken,
         FROM_HERE,
@@ -551,7 +552,7 @@ IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, GatherStatistics) {
 
   // No stats should be recorded for this CPUUsage because this was the first
   // call to GatherStatistics.
-  Database::MetricInfoVector stats = GetStats(METRIC_CPU_USAGE);
+  std::vector<Metric> stats = GetStats(METRIC_CPU_USAGE);
   ASSERT_EQ(0u, stats.size());
 
   stats = GetStats(METRIC_PRIVATE_MEMORY_USAGE);
@@ -677,7 +678,7 @@ IN_PROC_BROWSER_TEST_F(PerformanceMonitorUncleanExitBrowserTest,
 }
 
 IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, StartupTime) {
-  Database::MetricInfoVector metrics = GetStats(METRIC_TEST_STARTUP_TIME);
+  std::vector<Metric> metrics = GetStats(METRIC_TEST_STARTUP_TIME);
 
   ASSERT_EQ(1u, metrics.size());
   ASSERT_LT(metrics[0].value, kMaxStartupTime.ToInternalValue());
@@ -692,7 +693,7 @@ IN_PROC_BROWSER_TEST_F(PerformanceMonitorSessionRestoreBrowserTest,
 
   QuitBrowserAndRestore(browser(), 1);
 
-  Database::MetricInfoVector metrics = GetStats(METRIC_TEST_STARTUP_TIME);
+  std::vector<Metric> metrics = GetStats(METRIC_TEST_STARTUP_TIME);
   ASSERT_EQ(1u, metrics.size());
   ASSERT_LT(metrics[0].value, kMaxStartupTime.ToInternalValue());
 
@@ -714,7 +715,7 @@ IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, PageLoadTime) {
       ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
                                 FilePath(FILE_PATH_LITERAL("title2.html"))));
 
-  Database::MetricInfoVector metrics = GetStats(METRIC_PAGE_LOAD_TIME);
+  std::vector<Metric> metrics = GetStats(METRIC_PAGE_LOAD_TIME);
 
   ASSERT_EQ(2u, metrics.size());
   ASSERT_LT(metrics[0].value, kMaxLoadTime.ToInternalValue());