Standardize which page loads are tracked

chrome/browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer_browsertest.cc

 // Copyright 2016 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 "chrome/browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/test/histogram_tester.h"
 #include "base/threading/platform_thread.h"
@@ skipping 327 matching lines @@
   histogram_tester_.ExpectTotalCount(internal::kHttpsEngagementHistogram, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(HttpsEngagementPageLoadMetricsBrowserTest,
                        Navigate_Both_NonHtmlMainResource) {
   StartHttpServer();
   StartHttpsServer(false);
   NavigateTwiceInTabAndClose(http_test_server_->GetURL("/circle.svg"),
                              https_test_server_->GetURL("/circle.svg"));
 
-  // TODO(bmcquade): for the time being, the page load metrics infrastructure
-  // also tracks non-HTML resources. We should update these to expect 0
-  // histogram events once that gets fixed. See crbug.com/627536.
-
   // Test the page load metrics.
-  histogram_tester_.ExpectTotalCount(internal::kHttpEngagementHistogram, 1);
-  histogram_tester_.ExpectTotalCount(internal::kHttpsEngagementHistogram, 1);
+  histogram_tester_.ExpectTotalCount(internal::kHttpEngagementHistogram, 0);
+  histogram_tester_.ExpectTotalCount(internal::kHttpsEngagementHistogram, 0);
 
   // Test the ratio metric.
   FakeUserMetricsUpload();
   histogram_tester_.ExpectTotalCount(
-      internal::kHttpsEngagementSessionPercentage, 1);
-  int32_t ratio_bucket =
-      histogram_tester_
-          .GetAllSamples(internal::kHttpsEngagementSessionPercentage)[0]
-          .min;
-  EXPECT_GT(100, ratio_bucket);
-  EXPECT_LT(0, ratio_bucket);
+      internal::kHttpsEngagementSessionPercentage, 0);
 }
 
 IN_PROC_BROWSER_TEST_F(HttpsEngagementPageLoadMetricsBrowserTest,
                        ClosedWhileHidden_Https) {
   StartHttpsServer(false);
   base::TimeDelta upper_bound =
       NavigateInForegroundAndCloseInBackgroundWithTiming(
           https_test_server_->GetURL("/simple.html"));
 
   // Test the page load metrics.
@@ skipping 111 matching lines @@
   // Test the ratio metric.
   FakeUserMetricsUpload();
   histogram_tester_.ExpectTotalCount(
       internal::kHttpsEngagementSessionPercentage, 0);
 }
 
 IN_PROC_BROWSER_TEST_F(HttpsEngagementPageLoadMetricsBrowserTest,
                        MultipleUploads) {
   StartHttpsServer(false);
 
-  NavigateInForegroundAndCloseWithTiming(https_test_server_->GetURL("/"));
+  NavigateInForegroundAndCloseWithTiming(
+      https_test_server_->GetURL("/simple.html"));
   histogram_tester_.ExpectTotalCount(
       internal::kHttpsEngagementSessionPercentage, 0);
   FakeUserMetricsUpload();
   FakeUserMetricsUpload();
   FakeUserMetricsUpload();
   histogram_tester_.ExpectTotalCount(
       internal::kHttpsEngagementSessionPercentage, 1);
 }