Various page_load_metrics cleanups and improvements

chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc

 // Copyright 2015 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/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/test/histogram_tester.h"
 #include "base/time/time.h"
 #include "chrome/browser/page_load_metrics/metrics_web_contents_observer.h"
 #include "chrome/browser/page_load_metrics/observers/aborts_page_load_metrics_observer.h"
@@ skipping 149 matching lines @@
  public:
   PageLoadMetricsBrowserTest() {}
   ~PageLoadMetricsBrowserTest() override {}
 
  protected:
   void NavigateToUntrackedUrl() {
     ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
   }
 
   bool NoPageLoadMetricsRecorded() {
-    return histogram_tester_.GetTotalCountsForPrefix("PageLoad.").empty();
+    // Determine whether any 'public' page load metrics are recorded. We exclude
+    // 'internal' metrics as these may be recorded for debugging purposes.
+    size_t total_pageload_histograms =
+        histogram_tester_.GetTotalCountsForPrefix("PageLoad.").size();
+    size_t total_internal_histograms =
+        histogram_tester_.GetTotalCountsForPrefix("PageLoad.Internal.").size();
+    DCHECK_GE(total_pageload_histograms, total_internal_histograms);
+    return total_pageload_histograms - total_internal_histograms == 0;
   }
 
   scoped_refptr<TimingUpdatedObserver> CreateTimingUpdatedObserver() {
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     scoped_refptr<TimingUpdatedObserver> observer(new TimingUpdatedObserver(
         web_contents->GetRenderViewHost()->GetWidget()));
     return observer;
   }
 
@@ skipping 303 matching lines @@
   // documents with non-well-formed XML on the blink side. See crbug.com/627607
   // for more.
   ui_test_utils::NavigateToURL(
       browser(),
       embedded_test_server()->GetURL("/page_load_metrics/badxml.xhtml"));
 
   timing_observer->WaitForMatchingIPC();
 
   histogram_tester_.ExpectTotalCount(internal::kHistogramFirstLayout, 0);
   histogram_tester_.ExpectTotalCount(internal::kHistogramFirstPaint, 0);
-  histogram_tester_.ExpectBucketCount(page_load_metrics::internal::kErrorEvents,
-                                      page_load_metrics::ERR_BAD_TIMING_IPC, 1);
+  histogram_tester_.ExpectBucketCount(
+      page_load_metrics::internal::kErrorEvents,
+      page_load_metrics::ERR_BAD_TIMING_IPC_INVALID_TIMING, 1);
 }
 
 // Test code that aborts provisional navigations.
 // TODO(csharrison): Move these to unit tests once the navigation API in content
 // properly calls NavigationHandle/NavigationThrottle methods.
 IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, AbortNewNavigation) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   GURL url(embedded_test_server()->GetURL("/title1.html"));
   chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_LINK);
@@ skipping 247 matching lines @@
   ui_test_utils::NavigateToURL(browser(), embedded_test_server()->GetURL(
                                               "/page_load_metrics/large.html"));
   NavigateToUntrackedUrl();
 
   histogram_tester_.ExpectTotalCount(internal::kHistogramTotalBytes, 1);
 
   // Verify that there is a single sample recorded in the 10kB bucket (the size
   // of the main HTML response).
   histogram_tester_.ExpectBucketCount(internal::kHistogramTotalBytes, 10, 1);
 }