Add BytesRead metric to CPM

chrome/browser/performance_monitor/performance_monitor_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ skipping 141 matching lines @@
     // If we begin the tests prior to full initialization, we cannot predict
     // the behavior or mock synchronicity as we must. Wait for initialization
     // to complete fully before proceeding with the test.
     content::WindowedNotificationObserver windowed_observer(
         chrome::NOTIFICATION_PERFORMANCE_MONITOR_INITIALIZED,
         content::NotificationService::AllSources());
 
     performance_monitor_->Start();
 
     windowed_observer.Wait();
+
+    // We stop the timer in charge of doing timed collections so that we can
+    // enforce when, and how many times, we do these collections.
+    performance_monitor_->timer_.Stop();
   }
 
   // A handle for gathering statistics from the database, which must be done on
   // the background thread. Since we are testing, we can mock synchronicity with
   // FlushForTesting().
   void GatherStatistics() {
     content::BrowserThread::PostBlockingPoolSequencedTask(
         Database::kDatabaseSequenceToken,
         FROM_HERE,
         base::Bind(&PerformanceMonitor::GatherStatisticsOnBackgroundThread,
@@ skipping 542 matching lines @@
       ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
                                 FilePath(FILE_PATH_LITERAL("title2.html"))));
 
   Database::MetricInfoVector metrics = GetStats(METRIC_PAGE_LOAD_TIME);
 
   ASSERT_EQ(2u, metrics.size());
   ASSERT_LT(metrics[0].value, kMaxLoadTime.ToInternalValue());
   ASSERT_LT(metrics[1].value, kMaxLoadTime.ToInternalValue());
 }
 
+IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, BytesRead) {
+  FilePath test_dir;
+  PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
+
+  int64 page1_size = 0;
+  file_util::GetFileSize(test_dir.AppendASCII("title1.html"), &page1_size);
+
+  int64 page2_size = 0;
+  file_util::GetFileSize(test_dir.AppendASCII("title2.html"), &page2_size);
+
+  ui_test_utils::NavigateToURL(
+      browser(),
+      ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
+                                FilePath(FILE_PATH_LITERAL("title1.html"))));
+  performance_monitor()->DoTimedCollections();
+
+  Database::MetricInfoVector metrics = GetStats(METRIC_BYTES_READ);
+  ASSERT_EQ(1u, metrics.size());
+  ASSERT_EQ(page1_size, metrics[0].value);
+
+  ui_test_utils::NavigateToURL(
+      browser(),
+      ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
+                                FilePath(FILE_PATH_LITERAL("title2.html"))));
+  performance_monitor()->DoTimedCollections();
+
+  metrics = GetStats(METRIC_BYTES_READ);
+
+  ASSERT_EQ(2u, metrics.size());
+  ASSERT_EQ(page1_size + page2_size, metrics[1].value);
+}
+
 }  // namespace performance_monitor