PageLoadMetrics: Add test harness in component

This patch added PageLoadMetricsObserverContentTestHarness in component,
so chrome's observer unittests can be easily move to components. The
main changes are
- Moved PageLoadMetricsObserverTester to components
- Moved PageLoadMetricsTestContentBrowserClient to separated files for sharing.
- Moved use_counter_page_load_metrics_observer.cc to components to
  verify PageLoadMetricsObserverContentTestHarness working.
- The other observers changes are renaming.

Bug: 995880
Change-Id: I4f64d8c8941c586d5b44791911ddbc0606b6061c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1838474Reviewed-by: Charlie Harrison <csharrison@chromium.org>
Reviewed-by: Bryan McQuade <bmcquade@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Tao Bai <michaelbai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704690}

chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_unittest.cc

@@ -22,13 +22,13 @@
 #include "base/time/time.h"
 #include "chrome/browser/heavy_ad_intervention/heavy_ad_blocklist.h"
 #include "chrome/browser/page_load_metrics/observers/ad_metrics/frame_data.h"
-#include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_tester.h"
 #include "chrome/browser/subresource_filter/subresource_filter_test_harness.h"
 #include "chrome/common/chrome_features.h"
 #include "components/blacklist/opt_out_blacklist/opt_out_blacklist_data.h"
 #include "components/blacklist/opt_out_blacklist/opt_out_blacklist_delegate.h"
 #include "components/blacklist/opt_out_blacklist/opt_out_store.h"
 #include "components/page_load_metrics/browser/metrics_web_contents_observer.h"
+#include "components/page_load_metrics/browser/observers/page_load_metrics_observer_tester.h"
 #include "components/page_load_metrics/browser/page_load_metrics_observer.h"
 #include "components/page_load_metrics/browser/page_load_tracker.h"
 #include "components/page_load_metrics/common/test/page_load_metrics_test_util.h"

chrome/browser/page_load_metrics/observers/android_page_load_metrics_observer_unittest.cc

@@ -200,7 +200,8 @@ TEST_F(AndroidPageLoadMetricsObserverTest, LoadTimingInfo) {
       nullptr
       /* data_reduction_proxy_data */,
       content::ResourceType::kMainFrame, 0, std::move(load_timing_info));
-  SimulateLoadedResource(info, navigation_simulator->GetGlobalRequestID());
+  tester()->SimulateLoadedResource(info,
+                                   navigation_simulator->GetGlobalRequestID());
   EXPECT_EQ(kNow.since_origin().InMilliseconds(),
             observer()->reported_dns_start_ms());
 }
@@ -218,7 +219,7 @@ TEST_F(AndroidPageLoadMetricsObserverTest, LoadEvents) {
       base::TimeDelta::FromMilliseconds(20);
   PopulateRequiredTimingFields(&timing);
   NavigateAndCommit(GURL("https://www.example.com"));
-  SimulateTimingUpdate(timing);
+  tester()->SimulateTimingUpdate(timing);
   EXPECT_EQ(30, observer()->reported_load_event_start_ms());
   EXPECT_EQ(GetNavigationStartMicroseconds(),
             observer()->reported_navigation_start_tick_load());

chrome/browser/page_load_metrics/observers/data_reduction_proxy_metrics_observer_base_unittest.cc

@@ -105,7 +105,8 @@ class DataReductionProxyMetricsObserverBaseTest
                    uint64_t want_original_bytes,
                    uint64_t want_uuid) {
     using UkmEntry = ukm::builders::DataReductionProxy;
-    auto entries = test_ukm_recorder().GetEntriesByName(UkmEntry::kEntryName);
+    auto entries =
+        tester()->test_ukm_recorder().GetEntriesByName(UkmEntry::kEntryName);
 
     if (!want_ukm) {
       EXPECT_EQ(0u, entries.size());
@@ -114,12 +115,13 @@ class DataReductionProxyMetricsObserverBaseTest
 
     EXPECT_EQ(1u, entries.size());
     for (const auto* const entry : entries) {
-      test_ukm_recorder().ExpectEntrySourceHasUrl(entry, GURL(kDefaultTestUrl));
+      tester()->test_ukm_recorder().ExpectEntrySourceHasUrl(
+          entry, GURL(kDefaultTestUrl));
 
-      test_ukm_recorder().ExpectEntryMetric(
+      tester()->test_ukm_recorder().ExpectEntryMetric(
           entry, UkmEntry::kEstimatedOriginalNetworkBytesName,
           want_original_bytes);
-      test_ukm_recorder().ExpectEntryMetric(
+      tester()->test_ukm_recorder().ExpectEntryMetric(
           entry, UkmEntry::kDataSaverPageUUIDName, want_uuid);
     }
   }
@@ -163,9 +165,9 @@ TEST_F(DataReductionProxyMetricsObserverBaseTest,
       false /* was_cached */, 2 * 1024 /* delta_bytes */,
       true /* is_complete */, true /* proxy_used*/, 5 /* compression_ratio */));
 
-  SimulateResourceDataUseUpdate(resources);
+  tester()->SimulateResourceDataUseUpdate(resources);
 
-  NavigateToUntrackedUrl();
+  tester()->NavigateToUntrackedUrl();
   // Use https://play.golang.org/p/XnMDcTiPzt8 to generate an updated uuid.
   ValidateUKM(true, 9918U, 5261012271403106530);
 }
@@ -185,9 +187,9 @@ TEST_F(DataReductionProxyMetricsObserverBaseTest,
       false /* was_cached */, 2 * 1024 /* delta_bytes */,
       true /* is_complete */, true /* proxy_used*/, 5 /* compression_ratio */));
 
-  SimulateResourceDataUseUpdate(resources);
+  tester()->SimulateResourceDataUseUpdate(resources);
 
-  NavigateToUntrackedUrl();
+  tester()->NavigateToUntrackedUrl();
   // Use https://play.golang.org/p/XnMDcTiPzt8 to generate an updated uuid.
   ValidateUKM(true, 9918U, 7538012597823726222);
 }

chrome/browser/page_load_metrics/observers/data_reduction_proxy_metrics_observer_test_utils.cc

@@ -83,7 +83,7 @@ void DataReductionProxyMetricsObserverTestBase::RunTest(
   opt_out_expected_ = opt_out_expected;
   black_listed_ = black_listed;
   NavigateAndCommit(GURL(kDefaultTestUrl));
-  SimulateTimingUpdate(timing_);
+  tester()->SimulateTimingUpdate(timing_);
 }
 
 void DataReductionProxyMetricsObserverTestBase::
@@ -92,7 +92,7 @@ void DataReductionProxyMetricsObserverTestBase::
                                      bool opt_out_expected) {
   RunTest(data_reduction_proxy_used, is_using_lite_page, opt_out_expected,
           false);
-  NavigateToUntrackedUrl();
+  tester()->NavigateToUntrackedUrl();
 }
 
 void DataReductionProxyMetricsObserverTestBase::RunLitePageRedirectTest(
@@ -101,7 +101,7 @@ void DataReductionProxyMetricsObserverTestBase::RunLitePageRedirectTest(
   preview_info_ = preview_info;
   ect_ = ect;
   NavigateAndCommit(GURL(kDefaultTestUrl));
-  SimulateTimingUpdate(timing_);
+  tester()->SimulateTimingUpdate(timing_);
 }
 
 // Verify that, if expected and actual are set, their values are equal.

chrome/browser/page_load_metrics/observers/data_reduction_proxy_metrics_observer_unittest.cc

@@ -108,18 +108,18 @@ class DataReductionProxyMetricsObserverTest
   void ValidateHistogramsForSuffix(
       const std::string& histogram_suffix,
       const base::Optional<base::TimeDelta>& event) {
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         std::string(internal::kHistogramDataReductionProxyPrefix)
             .append(histogram_suffix),
         data_reduction_proxy_used() || cached_data_reduction_proxy_used() ? 1
                                                                           : 0);
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         std::string(internal::kHistogramDataReductionProxyLitePagePrefix)
             .append(histogram_suffix),
         is_using_lite_page() ? 1 : 0);
     if (!(data_reduction_proxy_used() || cached_data_reduction_proxy_used()))
       return;
-    histogram_tester().ExpectUniqueSample(
+    tester()->histogram_tester().ExpectUniqueSample(
         std::string(internal::kHistogramDataReductionProxyPrefix)
             .append(histogram_suffix),
         static_cast<base::HistogramBase::Sample>(
@@ -127,7 +127,7 @@ class DataReductionProxyMetricsObserverTest
         1);
     if (!is_using_lite_page())
       return;
-    histogram_tester().ExpectUniqueSample(
+    tester()->histogram_tester().ExpectUniqueSample(
         std::string(internal::kHistogramDataReductionProxyLitePagePrefix)
             .append(histogram_suffix),
         event.value().InMilliseconds(), is_using_lite_page() ? 1 : 0);
@@ -138,67 +138,67 @@ class DataReductionProxyMetricsObserverTest
                               int64_t network_bytes,
                               int64_t drp_bytes,
                               int64_t ocl_bytes) {
-    histogram_tester().ExpectUniqueSample(
+    tester()->histogram_tester().ExpectUniqueSample(
         std::string(internal::kHistogramDataReductionProxyPrefix)
             .append(internal::kResourcesPercentProxied),
         100 * drp_resources / network_resources, 1);
 
-    histogram_tester().ExpectUniqueSample(
+    tester()->histogram_tester().ExpectUniqueSample(
         std::string(internal::kHistogramDataReductionProxyPrefix)
             .append(internal::kBytesPercentProxied),
         static_cast<int>(100 * drp_bytes / network_bytes), 1);
 
-    histogram_tester().ExpectUniqueSample(
+    tester()->histogram_tester().ExpectUniqueSample(
         std::string(internal::kHistogramDataReductionProxyPrefix)
             .append(internal::kNetworkResources),
         network_resources, 1);
 
-    histogram_tester().ExpectUniqueSample(
+    tester()->histogram_tester().ExpectUniqueSample(
         std::string(internal::kHistogramDataReductionProxyPrefix)
             .append(internal::kResourcesProxied),
         drp_resources, 1);
 
-    histogram_tester().ExpectUniqueSample(
+    tester()->histogram_tester().ExpectUniqueSample(
         std::string(internal::kHistogramDataReductionProxyPrefix)
             .append(internal::kResourcesNotProxied),
         network_resources - drp_resources, 1);
 
-    histogram_tester().ExpectUniqueSample(
+    tester()->histogram_tester().ExpectUniqueSample(
         std::string(internal::kHistogramDataReductionProxyPrefix)
             .append(internal::kNetworkBytes),
         static_cast<int>(network_bytes / 1024), 1);
 
-    histogram_tester().ExpectUniqueSample(
+    tester()->histogram_tester().ExpectUniqueSample(
         std::string(internal::kHistogramDataReductionProxyPrefix)
             .append(internal::kBytesProxied),
         static_cast<int>(drp_bytes / 1024), 1);
 
-    histogram_tester().ExpectUniqueSample(
+    tester()->histogram_tester().ExpectUniqueSample(
         std::string(internal::kHistogramDataReductionProxyPrefix)
             .append(internal::kBytesNotProxied),
         static_cast<int>((network_bytes - drp_bytes) / 1024), 1);
 
-    histogram_tester().ExpectUniqueSample(
+    tester()->histogram_tester().ExpectUniqueSample(
         std::string(internal::kHistogramDataReductionProxyPrefix)
             .append(internal::kBytesOriginal),
         static_cast<int>(ocl_bytes / 1024), 1);
     if (ocl_bytes < network_bytes) {
-      histogram_tester().ExpectUniqueSample(
+      tester()->histogram_tester().ExpectUniqueSample(
           std::string(internal::kHistogramDataReductionProxyPrefix)
               .append(internal::kBytesInflationPercent),
           static_cast<int>(100 * network_bytes / ocl_bytes - 100), 1);
 
-      histogram_tester().ExpectUniqueSample(
+      tester()->histogram_tester().ExpectUniqueSample(
           std::string(internal::kHistogramDataReductionProxyPrefix)
               .append(internal::kBytesInflation),
           static_cast<int>((network_bytes - ocl_bytes) / 1024), 1);
     } else {
-      histogram_tester().ExpectUniqueSample(
+      tester()->histogram_tester().ExpectUniqueSample(
           std::string(internal::kHistogramDataReductionProxyPrefix)
               .append(internal::kBytesCompressionRatio),
           static_cast<int>(100 * network_bytes / ocl_bytes), 1);
 
-      histogram_tester().ExpectUniqueSample(
+      tester()->histogram_tester().ExpectUniqueSample(
           std::string(internal::kHistogramDataReductionProxyPrefix)
               .append(internal::kBytesSavings),
           static_cast<int>((ocl_bytes - network_bytes) / 1024), 1);
@@ -266,7 +266,7 @@ TEST_F(DataReductionProxyMetricsObserverTest, ByteInformationCompression) {
       false /* is_complete */, true /* proxy_used*/,
       0.5 /* compression_ratio */));
 
-  SimulateResourceDataUseUpdate(resources);
+  tester()->SimulateResourceDataUseUpdate(resources);
 
   int network_resources = 0;
   int drp_resources = 0;
@@ -300,7 +300,7 @@ TEST_F(DataReductionProxyMetricsObserverTest, ByteInformationCompression) {
         ++drp_resources;
     }
   }
-  NavigateToUntrackedUrl();
+  tester()->NavigateToUntrackedUrl();
 
   ValidateDataHistograms(network_resources, drp_resources,
                          insecure_network_bytes + secure_network_bytes,
@@ -331,7 +331,7 @@ TEST_F(DataReductionProxyMetricsObserverTest, ByteInformationInflation) {
       false /* is_complete */, true /* proxy_used*/,
       10 /* compression_ratio */));
 
-  SimulateResourceDataUseUpdate(resources);
+  tester()->SimulateResourceDataUseUpdate(resources);
 
   int network_resources = 0;
   int drp_resources = 0;
@@ -369,7 +369,7 @@ TEST_F(DataReductionProxyMetricsObserverTest, ByteInformationInflation) {
         ++drp_resources;
     }
   }
-  NavigateToUntrackedUrl();
+  tester()->NavigateToUntrackedUrl();
 
   ValidateDataHistograms(network_resources, drp_resources,
                          insecure_network_bytes + secure_network_bytes,

chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc

@@ -22,14 +22,14 @@ class DocumentWritePageLoadMetricsObserverTest
   }
 
   void AssertNoBlockHistogramsLogged() {
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 0);
   }
 };
 
 TEST_F(DocumentWritePageLoadMetricsObserverTest, NoMetrics) {
   AssertNoBlockHistogramsLogged();
-  EXPECT_EQ(0ul, test_ukm_recorder().entries_count());
+  EXPECT_EQ(0ul, tester()->test_ukm_recorder().entries_count());
 }
 
 TEST_F(DocumentWritePageLoadMetricsObserverTest, PossibleBlock) {
@@ -56,28 +56,28 @@ TEST_F(DocumentWritePageLoadMetricsObserverTest, PossibleBlock) {
   metadata.behavior_flags |=
       blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorDocumentWriteBlock;
   NavigateAndCommit(GURL("https://www.google.com/"));
-  SimulateTimingAndMetadataUpdate(timing, metadata);
+  tester()->SimulateTimingAndMetadataUpdate(timing, metadata);
 
-  histogram_tester().ExpectTotalCount(internal::kHistogramDocWriteBlockCount,
-                                      1);
-  histogram_tester().ExpectTotalCount(
+  tester()->histogram_tester().ExpectTotalCount(
+      internal::kHistogramDocWriteBlockCount, 1);
+  tester()->histogram_tester().ExpectTotalCount(
       internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 1);
-  histogram_tester().ExpectBucketCount(
+  tester()->histogram_tester().ExpectBucketCount(
       internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint,
       contentful_paint.InMilliseconds(), 1);
 
   using Entry = ukm::builders::Intervention_DocumentWrite_ScriptBlock;
 
   std::map<ukm::SourceId, ukm::mojom::UkmEntryPtr> entries =
-      test_ukm_recorder().GetMergedEntriesByName(Entry::kEntryName);
+      tester()->test_ukm_recorder().GetMergedEntriesByName(Entry::kEntryName);
   EXPECT_EQ(1u, entries.size());
   for (const auto& kv : entries) {
-    test_ukm_recorder().ExpectEntrySourceHasUrl(
+    tester()->test_ukm_recorder().ExpectEntrySourceHasUrl(
         kv.second.get(), GURL("https://www.google.com/"));
-    test_ukm_recorder().ExpectEntryMetric(
+    tester()->test_ukm_recorder().ExpectEntryMetric(
         kv.second.get(),
         Entry::kParseTiming_ParseBlockedOnScriptLoadFromDocumentWriteName, 5);
-    test_ukm_recorder().ExpectEntryMetric(
+    tester()->test_ukm_recorder().ExpectEntryMetric(
         kv.second.get(),
         Entry::kParseTiming_ParseBlockedOnScriptExecutionFromDocumentWriteName,
         3);
@@ -85,9 +85,9 @@ TEST_F(DocumentWritePageLoadMetricsObserverTest, PossibleBlock) {
 
   NavigateAndCommit(GURL("https://www.example.com/"));
 
-  histogram_tester().ExpectTotalCount(
+  tester()->histogram_tester().ExpectTotalCount(
       internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 1);
-  histogram_tester().ExpectBucketCount(
+  tester()->histogram_tester().ExpectBucketCount(
       internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint,
       contentful_paint.InMilliseconds(), 1);
 }
@@ -105,49 +105,51 @@ TEST_F(DocumentWritePageLoadMetricsObserverTest, PossibleBlockReload) {
   metadata.behavior_flags |= blink::WebLoadingBehaviorFlag::
       kWebLoadingBehaviorDocumentWriteBlockReload;
   NavigateAndCommit(GURL("https://www.google.com/"));
-  SimulateTimingAndMetadataUpdate(timing, metadata);
+  tester()->SimulateTimingAndMetadataUpdate(timing, metadata);
 
-  histogram_tester().ExpectTotalCount(
+  tester()->histogram_tester().ExpectTotalCount(
       internal::kHistogramDocWriteBlockReloadCount, 1);
 
   using Entry = ukm::builders::Intervention_DocumentWrite_ScriptBlock;
-  auto entries = test_ukm_recorder().GetEntriesByName(Entry::kEntryName);
+  auto entries =
+      tester()->test_ukm_recorder().GetEntriesByName(Entry::kEntryName);
   EXPECT_EQ(1u, entries.size());
   const ukm::mojom::UkmEntry* entry1 = nullptr;
   for (const auto* const entry : entries) {
-    test_ukm_recorder().ExpectEntrySourceHasUrl(
+    tester()->test_ukm_recorder().ExpectEntrySourceHasUrl(
         entry, GURL("https://www.google.com/"));
-    test_ukm_recorder().ExpectEntryMetric(entry, Entry::kDisabled_ReloadName,
-                                          true);
+    tester()->test_ukm_recorder().ExpectEntryMetric(
+        entry, Entry::kDisabled_ReloadName, true);
     entry1 = entry;
   }
 
   // Another reload.
   NavigateAndCommit(GURL("https://www.example.com/"));
-  SimulateTimingAndMetadataUpdate(timing, metadata);
+  tester()->SimulateTimingAndMetadataUpdate(timing, metadata);
 
-  histogram_tester().ExpectTotalCount(
+  tester()->histogram_tester().ExpectTotalCount(
       internal::kHistogramDocWriteBlockReloadCount, 2);
 
-  auto entries2 = test_ukm_recorder().GetEntriesByName(Entry::kEntryName);
+  auto entries2 =
+      tester()->test_ukm_recorder().GetEntriesByName(Entry::kEntryName);
   EXPECT_EQ(2u, entries2.size());
   for (const auto* const entry : entries2) {
     if (entry != entry1)
-      test_ukm_recorder().ExpectEntrySourceHasUrl(
+      tester()->test_ukm_recorder().ExpectEntrySourceHasUrl(
           entry, GURL("https://www.example.com/"));
-    test_ukm_recorder().ExpectEntryMetric(entry, Entry::kDisabled_ReloadName,
-                                          true);
+    tester()->test_ukm_recorder().ExpectEntryMetric(
+        entry, Entry::kDisabled_ReloadName, true);
   }
 
   // Another metadata update should not increase reload count.
   metadata.behavior_flags |=
       blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorServiceWorkerControlled;
-  SimulateTimingAndMetadataUpdate(timing, metadata);
-  histogram_tester().ExpectTotalCount(
+  tester()->SimulateTimingAndMetadataUpdate(timing, metadata);
+  tester()->histogram_tester().ExpectTotalCount(
       internal::kHistogramDocWriteBlockReloadCount, 2);
 
-  histogram_tester().ExpectTotalCount(internal::kHistogramDocWriteBlockCount,
-                                      0);
+  tester()->histogram_tester().ExpectTotalCount(
+      internal::kHistogramDocWriteBlockCount, 0);
 }
 
 TEST_F(DocumentWritePageLoadMetricsObserverTest, NoPossibleBlock) {
@@ -160,7 +162,7 @@ TEST_F(DocumentWritePageLoadMetricsObserverTest, NoPossibleBlock) {
 
   page_load_metrics::mojom::PageLoadMetadata metadata;
   NavigateAndCommit(GURL("https://www.google.com/"));
-  SimulateTimingAndMetadataUpdate(timing, metadata);
+  tester()->SimulateTimingAndMetadataUpdate(timing, metadata);
 
   NavigateAndCommit(GURL("https://www.example.com/"));
   AssertNoBlockHistogramsLogged();

chrome/browser/page_load_metrics/observers/live_tab_count_page_load_metrics_observer_unittest.cc

@@ -70,7 +70,7 @@ class LiveTabCountPageLoadMetricsObserverTest
       web_contents()->WasShown();
     }
 
-    SimulateTimingUpdate(timing);
+    tester()->SimulateTimingUpdate(timing);
   }
 
  protected:
@@ -86,7 +86,7 @@ class LiveTabCountPageLoadMetricsObserverTest
         std::string(internal::kHistogramPrefixLiveTabCount) +
         std::string(page_load_histogram_suffix);
     for (size_t bucket = 0; bucket < expected_counts.size(); bucket++) {
-      histogram_tester().ExpectTotalCount(
+      tester()->histogram_tester().ExpectTotalCount(
           tab_count_metrics::HistogramName(histogram_prefix,
                                            /* live_tabs_only = */ true, bucket),
           expected_counts[bucket]);

chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer_unittest.cc

@@ -69,12 +69,12 @@ class LoadingPredictorPageLoadMetricsObserverTest
         .WillOnce(testing::Return(is_preconnectable));
 
     NavigateAndCommit(main_frame_url);
-    SimulateTimingUpdate(timing_);
+    tester()->SimulateTimingUpdate(timing_);
 
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         internal::kHistogramLoadingPredictorFirstContentfulPaintPreconnectable,
         is_preconnectable ? 1 : 0);
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         internal::kHistogramLoadingPredictorFirstMeaningfulPaintPreconnectable,
         is_preconnectable ? 1 : 0);
   }

chrome/browser/page_load_metrics/observers/local_network_requests_page_load_metrics_observer_unittest.cc

@@ -101,15 +101,16 @@ class LocalNetworkRequestsPageLoadMetricsObserverTest
 
   void SimulateLoadedSuccessfulResource(
       const internal::PageAddressInfo& resource) {
-    SimulateLoadedResource(resource, 0);
+    SimulateLoadedResourceWithNetError(resource, 0);
   }
 
   void SimulateLoadedFailedResource(const internal::PageAddressInfo& resource) {
-    SimulateLoadedResource(resource, net::ERR_CONNECTION_REFUSED);
+    SimulateLoadedResourceWithNetError(resource, net::ERR_CONNECTION_REFUSED);
   }
 
-  void SimulateLoadedResource(const internal::PageAddressInfo& resource,
-                              const int net_error) {
+  void SimulateLoadedResourceWithNetError(
+      const internal::PageAddressInfo& resource,
+      const int net_error) {
     net::IPAddress address;
     ASSERT_TRUE(address.AssignFromIPLiteral(resource.host_ip));
     page_load_metrics::ExtraRequestCompleteInfo request_info(
@@ -121,7 +122,7 @@ class LocalNetworkRequestsPageLoadMetricsObserverTest
         content::ResourceType::kMainFrame, net_error,
         {} /* load_timing_info */);
 
-    PageLoadMetricsObserverTestHarness::SimulateLoadedResource(
+    tester()->SimulateLoadedResource(
         request_info, navigation_simulator_->GetGlobalRequestID());
   }
 
@@ -151,13 +152,15 @@ class LocalNetworkRequestsPageLoadMetricsObserverTest
     for (const auto& port :
          internal::GetLocalhostHistogramNames().at(domain_type)) {
       for (const auto& histogramName : port.second) {
-        histogram_tester().ExpectUniqueSample(histogramName.second, 0, 1);
+        tester()->histogram_tester().ExpectUniqueSample(histogramName.second, 0,
+                                                        1);
       }
     }
     for (const auto& resource :
          internal::GetNonlocalhostHistogramNames().at(domain_type)) {
       for (const auto& histogramName : resource.second) {
-        histogram_tester().ExpectUniqueSample(histogramName.second, 0, 1);
+        tester()->histogram_tester().ExpectUniqueSample(histogramName.second, 0,
+                                                        1);
       }
     }
   }
@@ -166,14 +169,14 @@ class LocalNetworkRequestsPageLoadMetricsObserverTest
     for (const auto& domain : internal::GetLocalhostHistogramNames()) {
       for (const auto& port : domain.second) {
         for (const auto& status : port.second) {
-          histogram_tester().ExpectTotalCount(status.second, 0);
+          tester()->histogram_tester().ExpectTotalCount(status.second, 0);
         }
       }
     }
     for (const auto& domain : internal::GetNonlocalhostHistogramNames()) {
       for (const auto& resource : domain.second) {
         for (const auto& status : resource.second) {
-          histogram_tester().ExpectTotalCount(status.second, 0);
+          tester()->histogram_tester().ExpectTotalCount(status.second, 0);
         }
       }
     }
@@ -181,12 +184,13 @@ class LocalNetworkRequestsPageLoadMetricsObserverTest
 
   void ExpectUkmPageDomainMetric(const internal::PageAddressInfo& page,
                                  const internal::DomainType domain_type) {
-    auto entries = test_ukm_recorder().GetEntriesByName(
+    auto entries = tester()->test_ukm_recorder().GetEntriesByName(
         ukm::builders::PageDomainInfo::kEntryName);
     EXPECT_EQ(1u, entries.size());
     for (const auto* const entry : entries) {
-      test_ukm_recorder().ExpectEntrySourceHasUrl(entry, GURL(page.url));
-      test_ukm_recorder().ExpectEntryMetric(
+      tester()->test_ukm_recorder().ExpectEntrySourceHasUrl(entry,
+                                                            GURL(page.url));
+      tester()->test_ukm_recorder().ExpectEntryMetric(
           entry, ukm::builders::PageDomainInfo::kDomainTypeName,
           static_cast<int>(domain_type));
     }
@@ -197,23 +201,24 @@ class LocalNetworkRequestsPageLoadMetricsObserverTest
       const std::vector<internal::UkmMetricInfo>& expected_metrics,
       const std::map<std::string, int>& expected_histograms) {
     using LocalNetworkRequests = ukm::builders::LocalNetworkRequests;
-    auto entries =
-        test_ukm_recorder().GetEntriesByName(LocalNetworkRequests::kEntryName);
+    auto entries = tester()->test_ukm_recorder().GetEntriesByName(
+        LocalNetworkRequests::kEntryName);
     ASSERT_EQ(entries.size(), expected_metrics.size());
     for (size_t i = 0; i < entries.size() && i < expected_metrics.size(); i++) {
-      test_ukm_recorder().ExpectEntrySourceHasUrl(entries[i], GURL(page.url));
-      test_ukm_recorder().ExpectEntryMetric(
+      tester()->test_ukm_recorder().ExpectEntrySourceHasUrl(entries[i],
+                                                            GURL(page.url));
+      tester()->test_ukm_recorder().ExpectEntryMetric(
           entries[i], LocalNetworkRequests::kResourceTypeName,
           expected_metrics[i].resource_type);
-      test_ukm_recorder().ExpectEntryMetric(
+      tester()->test_ukm_recorder().ExpectEntryMetric(
           entries[i], LocalNetworkRequests::kCount_SuccessfulName,
           expected_metrics[i].success_count);
-      test_ukm_recorder().ExpectEntryMetric(
+      tester()->test_ukm_recorder().ExpectEntryMetric(
           entries[i], LocalNetworkRequests::kCount_FailedName,
           expected_metrics[i].failed_count);
       if (expected_metrics[i].resource_type ==
           internal::RESOURCE_TYPE_LOCALHOST) {
-        test_ukm_recorder().ExpectEntryMetric(
+        tester()->test_ukm_recorder().ExpectEntryMetric(
             entries[i], LocalNetworkRequests::kPortTypeName,
             static_cast<int>(expected_metrics[i].port_type));
       }
@@ -221,7 +226,8 @@ class LocalNetworkRequestsPageLoadMetricsObserverTest
 
     // Should have generated UMA histograms for all requests made.
     for (auto hist : expected_histograms) {
-      histogram_tester().ExpectUniqueSample(hist.first, hist.second, 1);
+      tester()->histogram_tester().ExpectUniqueSample(hist.first, hist.second,
+                                                      1);
     }
   }
 
@@ -230,8 +236,8 @@ class LocalNetworkRequestsPageLoadMetricsObserverTest
 };
 
 TEST_F(LocalNetworkRequestsPageLoadMetricsObserverTest, NoMetrics) {
-  EXPECT_EQ(0ul, test_ukm_recorder().sources_count());
-  EXPECT_EQ(0ul, test_ukm_recorder().entries_count());
+  EXPECT_EQ(0ul, tester()->test_ukm_recorder().sources_count());
+  EXPECT_EQ(0ul, tester()->test_ukm_recorder().entries_count());
 
   // Sanity check
   ExpectNoHistograms();
@@ -717,7 +723,8 @@ TEST_F(LocalNetworkRequestsPageLoadMetricsObserverTest,
   };
   for (auto request : requests) {
     for (int i = 0; i < 100; ++i) {
-      SimulateLoadedResource(request.first, (request.second ? 0 : -1));
+      SimulateLoadedResourceWithNetError(request.first,
+                                         (request.second ? 0 : -1));
     }
   }
   for (int i = 0; i < 1000; ++i) {
@@ -727,7 +734,7 @@ TEST_F(LocalNetworkRequestsPageLoadMetricsObserverTest,
   // At this point, we should still only see the domain type UKM entry.
   // Also history manipulation intervention will log a UKM for navigating away
   // from a page without user interaction.
-  EXPECT_EQ(2ul, test_ukm_recorder().entries_count());
+  EXPECT_EQ(2ul, tester()->test_ukm_recorder().entries_count());
 
   // Close the page.
   DeleteContents();
@@ -777,7 +784,7 @@ TEST_F(LocalNetworkRequestsPageLoadMetricsObserverTest,
 
   // Load a resource that has the IP address in the URL but returned an empty
   // socket address for some reason.
-  PageLoadMetricsObserverTestHarness::SimulateLoadedResource(
+  PageLoadMetricsObserverTestHarness::tester()->SimulateLoadedResource(
       {GURL(internal::kDiffSubnetRequest2.url), net::IPEndPoint(),
        -1 /* frame_tree_node_id */, true /* was_cached */,
        1024 * 20 /* raw_body_bytes */, 0 /* original_network_content_length */,
@@ -804,7 +811,7 @@ TEST_F(LocalNetworkRequestsPageLoadMetricsObserverTest,
 
   // Load a resource that doesn't have the IP address in the URL and returned an
   // empty socket address (e.g., failed DNS resolution).
-  PageLoadMetricsObserverTestHarness::SimulateLoadedResource(
+  PageLoadMetricsObserverTestHarness::tester()->SimulateLoadedResource(
       {GURL(internal::kPrivatePage.url), net::IPEndPoint(),
        -1 /* frame_tree_node_id */, false /* was_cached */,
        0 /* raw_body_bytes */, 0 /* original_network_content_length */,
@@ -896,6 +903,6 @@ TEST_F(LocalNetworkRequestsPageLoadMetricsObserverTest, PrivatePageFailedLoad) {
   // Nothing should have been generated.
   // Note that the expected count is 1 because history manipulation intervention
   // will log a UKM for navigating away from a page without user interaction.
-  EXPECT_EQ(1ul, test_ukm_recorder().entries_count());
+  EXPECT_EQ(1ul, tester()->test_ukm_recorder().entries_count());
   ExpectNoHistograms();
 }

chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer_unittest.cc

@@ -51,13 +51,13 @@ class MediaPageLoadMetricsObserverTest
     NavigateAndCommit(GURL(kDefaultTestUrl));
 
     if (simulate_play_media)
-      SimulateMediaPlayed();
+      tester()->SimulateMediaPlayed();
 
-    SimulateTimingUpdate(timing_);
+    tester()->SimulateTimingUpdate(timing_);
 
     auto resources =
         GetSampleResourceDataUpdateForTesting(10 * 1024 /* resource_size */);
-    SimulateResourceDataUseUpdate(resources);
+    tester()->SimulateResourceDataUseUpdate(resources);
     for (const auto& resource : resources) {
       if (resource->is_complete) {
         if (resource->cache_type ==
@@ -70,9 +70,9 @@ class MediaPageLoadMetricsObserverTest
 
     if (simulate_app_background) {
       // The histograms should be logged when the app is backgrounded.
-      SimulateAppEnterBackground();
+      tester()->SimulateAppEnterBackground();
     } else {
-      NavigateToUntrackedUrl();
+      tester()->NavigateToUntrackedUrl();
     }
   }
 
@@ -96,13 +96,13 @@ TEST_F(MediaPageLoadMetricsObserverTest, MediaPlayed) {
   SimulatePageLoad(true /* simulate_play_media */,
                    false /* simulate_app_background */);
 
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.MediaPageLoad.Experimental.Bytes.Network",
       static_cast<int>(network_bytes_ / 1024), 1);
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.MediaPageLoad.Experimental.Bytes.Cache",
       static_cast<int>(cache_bytes_ / 1024), 1);
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.MediaPageLoad.Experimental.Bytes.Total",
       static_cast<int>((network_bytes_ + cache_bytes_) / 1024), 1);
 }
@@ -112,13 +112,13 @@ TEST_F(MediaPageLoadMetricsObserverTest, MediaPlayedAppBackground) {
   SimulatePageLoad(true /* simulate_play_media */,
                    true /* simulate_app_background */);
 
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.MediaPageLoad.Experimental.Bytes.Network",
       static_cast<int>(network_bytes_ / 1024), 1);
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.MediaPageLoad.Experimental.Bytes.Cache",
       static_cast<int>(cache_bytes_ / 1024), 1);
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.MediaPageLoad.Experimental.Bytes.Total",
       static_cast<int>((network_bytes_ + cache_bytes_) / 1024), 1);
 }
@@ -128,10 +128,10 @@ TEST_F(MediaPageLoadMetricsObserverTest, MediaNotPlayed) {
   SimulatePageLoad(false /* simulate_play_media */,
                    false /* simulate_app_background */);
 
-  histogram_tester().ExpectTotalCount(
+  tester()->histogram_tester().ExpectTotalCount(
       "PageLoad.Clients.MediaPageLoad.Experimental.Bytes.Network", 0);
-  histogram_tester().ExpectTotalCount(
+  tester()->histogram_tester().ExpectTotalCount(
       "PageLoad.Clients.MediaPageLoad.Experimental.Bytes.Cache", 0);
-  histogram_tester().ExpectTotalCount(
+  tester()->histogram_tester().ExpectTotalCount(
       "PageLoad.Clients.MediaPageLoad.Experimental.Bytes.Total", 0);
 }

chrome/browser/page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer_unittest.cc

@@ -70,7 +70,7 @@ class MultiTabLoadingPageLoadMetricsObserverTest
       web_contents()->WasShown();
     }
 
-    SimulateTimingUpdate(timing);
+    tester()->SimulateTimingUpdate(timing);
   }
 
  protected:
@@ -84,14 +84,14 @@ class MultiTabLoadingPageLoadMetricsObserverTest
                           base::HistogramBase::Count expected_base,
                           base::HistogramBase::Count expected_2_or_more,
                           base::HistogramBase::Count expected_5_or_more) {
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         std::string(internal::kHistogramPrefixMultiTabLoading).append(suffix),
         expected_base);
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         std::string(internal::kHistogramPrefixMultiTabLoading2OrMore)
             .append(suffix),
         expected_2_or_more);
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         std::string(internal::kHistogramPrefixMultiTabLoading5OrMore)
             .append(suffix),
         expected_5_or_more);

chrome/browser/page_load_metrics/observers/offline_page_previews_page_load_metrics_observer_unittest.cc

@@ -62,7 +62,7 @@ class OfflinePagePreviewsPageLoadMetricsObserverTest
   void RunTest(bool is_offline_preview) {
     is_offline_preview_ = is_offline_preview;
     NavigateAndCommit(GURL(kDefaultTestUrl1));
-    SimulateTimingUpdate(timing_);
+    tester()->SimulateTimingUpdate(timing_);
 
     // Navigate again to force OnComplete, which happens when a new navigation
     // occurs.
@@ -96,10 +96,11 @@ class OfflinePagePreviewsPageLoadMetricsObserverTest
 
   void ValidateHistogramsFor(const std::string& histogram,
                              const base::HistogramBase::Sample sample) {
-    histogram_tester().ExpectTotalCount(histogram, is_offline_preview_ ? 1 : 0);
+    tester()->histogram_tester().ExpectTotalCount(histogram,
+                                                  is_offline_preview_ ? 1 : 0);
     if (!is_offline_preview_)
       return;
-    histogram_tester().ExpectUniqueSample(histogram, sample, 1);
+    tester()->histogram_tester().ExpectUniqueSample(histogram, sample, 1);
   }
 
  protected:

chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc

@@ -8,15 +8,9 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "chrome/test/base/testing_browser_process.h"
 #include "components/ukm/content/source_url_recorder.h"
-#include "content/public/browser/global_request_id.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/referrer.h"
-#include "content/public/test/web_contents_tester.h"
-#include "third_party/blink/public/platform/web_input_event.h"
 #include "url/gurl.h"
-#include "url/url_constants.h"
 
 namespace page_load_metrics {
 
@@ -40,146 +34,6 @@ void PageLoadMetricsObserverTestHarness::SetUp() {
   web_contents()->WasShown();
 }
 
-void PageLoadMetricsObserverTestHarness::StartNavigation(const GURL& gurl) {
-  tester_->StartNavigation(gurl);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateTimingUpdate(
-    const mojom::PageLoadTiming& timing) {
-  tester_->SimulateTimingUpdate(timing);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateTimingUpdate(
-    const mojom::PageLoadTiming& timing,
-    content::RenderFrameHost* rfh) {
-  tester_->SimulateTimingUpdate(timing, rfh);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateTimingAndMetadataUpdate(
-    const mojom::PageLoadTiming& timing,
-    const mojom::PageLoadMetadata& metadata) {
-  tester_->SimulateTimingAndMetadataUpdate(timing, metadata);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateCpuTimingUpdate(
-    const mojom::CpuTiming& cpu_timing) {
-  tester_->SimulateCpuTimingUpdate(cpu_timing);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateMetadataUpdate(
-    const mojom::PageLoadMetadata& metadata,
-    content::RenderFrameHost* rfh) {
-  tester_->SimulateMetadataUpdate(metadata, rfh);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateResourceDataUseUpdate(
-    const std::vector<mojom::ResourceDataUpdatePtr>& resources) {
-  tester_->SimulateResourceDataUseUpdate(resources);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateResourceDataUseUpdate(
-    const std::vector<mojom::ResourceDataUpdatePtr>& resources,
-    content::RenderFrameHost* render_frame_host) {
-  tester_->SimulateResourceDataUseUpdate(resources, render_frame_host);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateFeaturesUpdate(
-    const mojom::PageLoadFeatures& new_features) {
-  tester_->SimulateFeaturesUpdate(new_features);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateRenderDataUpdate(
-    const mojom::FrameRenderDataUpdate& render_data) {
-  tester_->SimulateRenderDataUpdate(render_data);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateRenderDataUpdate(
-    const mojom::FrameRenderDataUpdate& render_data,
-    content::RenderFrameHost* render_frame_host) {
-  tester_->SimulateRenderDataUpdate(render_data, render_frame_host);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateLoadedResource(
-    const ExtraRequestCompleteInfo& info) {
-  tester_->SimulateLoadedResource(info, content::GlobalRequestID());
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateLoadedResource(
-    const ExtraRequestCompleteInfo& info,
-    const content::GlobalRequestID& request_id) {
-  tester_->SimulateLoadedResource(info, request_id);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateInputEvent(
-    const blink::WebInputEvent& event) {
-  tester_->SimulateInputEvent(event);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateAppEnterBackground() {
-  tester_->SimulateAppEnterBackground();
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateMediaPlayed() {
-  tester_->SimulateMediaPlayed();
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateCookiesRead(
-    const GURL& url,
-    const GURL& first_party_url,
-    const net::CookieList& cookie_list,
-    bool blocked_by_policy) {
-  tester_->SimulateCookiesRead(url, first_party_url, cookie_list,
-                               blocked_by_policy);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateCookieChange(
-    const GURL& url,
-    const GURL& first_party_url,
-    const net::CanonicalCookie& cookie,
-    bool blocked_by_policy) {
-  tester_->SimulateCookieChange(url, first_party_url, cookie,
-                                blocked_by_policy);
-}
-
-void PageLoadMetricsObserverTestHarness::SimulateDomStorageAccess(
-    const GURL& url,
-    const GURL& first_party_url,
-    bool local,
-    bool blocked_by_policy) {
-  tester_->SimulateDomStorageAccess(url, first_party_url, local,
-                                    blocked_by_policy);
-}
-
-const base::HistogramTester&
-PageLoadMetricsObserverTestHarness::histogram_tester() const {
-  return tester_->histogram_tester();
-}
-
-MetricsWebContentsObserver* PageLoadMetricsObserverTestHarness::observer()
-    const {
-  return tester_->observer();
-}
-
-const ukm::TestAutoSetUkmRecorder&
-PageLoadMetricsObserverTestHarness::test_ukm_recorder() const {
-  return tester_->test_ukm_recorder();
-}
-
-const PageLoadMetricsObserverDelegate&
-PageLoadMetricsObserverTestHarness::GetDelegateForCommittedLoad() const {
-  return tester_->GetDelegateForCommittedLoad();
-}
-
-void PageLoadMetricsObserverTestHarness::NavigateWithPageTransitionAndCommit(
-    const GURL& url,
-    ui::PageTransition transition) {
-  tester_->NavigateWithPageTransitionAndCommit(url, transition);
-}
-
-void PageLoadMetricsObserverTestHarness::NavigateToUntrackedUrl() {
-  tester_->NavigateToUntrackedUrl();
-}
-
 const char PageLoadMetricsObserverTestHarness::kResourceUrl[] =
     "https://www.example.com/resource";
 

chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h

@@ -8,42 +8,17 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "base/test/metrics/histogram_tester.h"
-#include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_tester.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
-#include "components/page_load_metrics/browser/page_load_metrics_observer.h"
-#include "components/ukm/test_ukm_recorder.h"
-#include "ui/base/page_transition_types.h"
-
-namespace base {
-class GURL;
-}  // namespace base
-
-namespace blink {
-class WebInputEvent;
-}  // namespace blink
-
-namespace content {
-struct GlobalRequestID;
-}  // namespace content
-
-namespace mojom {
-class PageLoadMetadata;
-class PageLoadTiming;
-}  // namespace mojom
+#include "components/page_load_metrics/browser/observers/page_load_metrics_observer_tester.h"
 
 namespace page_load_metrics {
 
-class MetricsWebContentsObserver;
 class PageLoadTracker;
 
-// This class can be used to drive tests of PageLoadMetricsObservers. To hook up
-// an observer, override RegisterObservers and call tracker->AddObserver. This
-// will attach the observer to all main frame navigations.
-//
-// This class is mostly just a wrapper around a PageLoadMetricsObserverTester.
-// Prefer to use the tester directly if you need to compose the testing logic
-// with another test harness.
+// This class can be used to drive tests of PageLoadMetricsObservers in Chrome.
+// To hook up an observer, override RegisterObservers and call
+// tracker->AddObserver. This will attach the observer to all main frame
+// navigations.
 class PageLoadMetricsObserverTestHarness
     : public ChromeRenderViewHostTestHarness {
  public:
@@ -57,86 +32,8 @@ class PageLoadMetricsObserverTestHarness
 
   virtual void RegisterObservers(PageLoadTracker* tracker) {}
 
-  // Simulates starting a navigation to the given gurl, without committing the
-  // navigation.
-  // Note: The navigation is left in a pending state and cannot be successfully
-  // completed.
-  void StartNavigation(const GURL& gurl);
-
-  // Simulates committing a navigation to the given URL with the given
-  // PageTransition.
-  void NavigateWithPageTransitionAndCommit(const GURL& url,
-                                           ui::PageTransition transition);
-
-  // Navigates to a URL that is not tracked by page_load_metrics. Useful for
-  // forcing the OnComplete method of a PageLoadMetricsObserver to run.
-  void NavigateToUntrackedUrl();
-
-  // Call this to simulate sending a PageLoadTiming IPC from the render process
-  // to the browser process. These will update the timing information for the
-  // most recently committed navigation.
-  void SimulateTimingUpdate(const mojom::PageLoadTiming& timing);
-  void SimulateTimingUpdate(const mojom::PageLoadTiming& timing,
-                            content::RenderFrameHost* rfh);
-  void SimulateTimingAndMetadataUpdate(const mojom::PageLoadTiming& timing,
-                                       const mojom::PageLoadMetadata& metadata);
-  void SimulateMetadataUpdate(const mojom::PageLoadMetadata& metadata,
-                              content::RenderFrameHost* rfh);
-  void SimulateFeaturesUpdate(const mojom::PageLoadFeatures& new_features);
-  void SimulateCpuTimingUpdate(const mojom::CpuTiming& cpu_timing);
-  void SimulateResourceDataUseUpdate(
-      const std::vector<mojom::ResourceDataUpdatePtr>& resources);
-  void SimulateResourceDataUseUpdate(
-      const std::vector<mojom::ResourceDataUpdatePtr>& resources,
-      content::RenderFrameHost* render_frame_host);
-  void SimulateRenderDataUpdate(
-      const mojom::FrameRenderDataUpdate& render_data);
-  void SimulateRenderDataUpdate(const mojom::FrameRenderDataUpdate& render_data,
-                                content::RenderFrameHost* rfh);
-
-  // Simulates a loaded resource. Main frame resources must specify a
-  // GlobalRequestID, using the SimulateLoadedResource() method that takes a
-  // |request_id| parameter.
-  void SimulateLoadedResource(const ExtraRequestCompleteInfo& info);
-
-  // Simulates a loaded resource, with the given GlobalRequestID.
-  void SimulateLoadedResource(const ExtraRequestCompleteInfo& info,
-                              const content::GlobalRequestID& request_id);
-
-  // Simulates a user input.
-  void SimulateInputEvent(const blink::WebInputEvent& event);
-
-  // Simulates the app being backgrounded.
-  void SimulateAppEnterBackground();
-
-  // Simulate playing a media element.
-  void SimulateMediaPlayed();
-
-  // Simulate reading cookies.
-  void SimulateCookiesRead(const GURL& url,
-                           const GURL& first_party_url,
-                           const net::CookieList& cookie_list,
-                           bool blocked_by_policy);
-
-  // Simulate writing a cookie.
-  void SimulateCookieChange(const GURL& url,
-                            const GURL& first_party_url,
-                            const net::CanonicalCookie& cookie,
-                            bool blocked_by_policy);
-
-  // Simulate accessing the local storage or session storage.
-  void SimulateDomStorageAccess(const GURL& url,
-                                const GURL& first_party_url,
-                                bool local,
-                                bool blocked_by_policy);
-
-  const base::HistogramTester& histogram_tester() const;
-
-  MetricsWebContentsObserver* observer() const;
-
-  const PageLoadMetricsObserverDelegate& GetDelegateForCommittedLoad() const;
-
-  const ukm::TestAutoSetUkmRecorder& test_ukm_recorder() const;
+  PageLoadMetricsObserverTester* tester() { return tester_.get(); }
+  const PageLoadMetricsObserverTester* tester() const { return tester_.get(); }
 
  private:
   std::unique_ptr<PageLoadMetricsObserverTester> tester_;

chrome/browser/page_load_metrics/observers/previews_page_load_metrics_observer_unittest.cc

@@ -124,11 +124,12 @@ class PreviewsPageLoadMetricsObserverTest
   void ValidateTimingHistogram(const std::string& histogram,
                                const base::Optional<base::TimeDelta>& event,
                                bool preview_was_active) {
-    histogram_tester().ExpectTotalCount(histogram, preview_was_active ? 1 : 0);
+    tester()->histogram_tester().ExpectTotalCount(histogram,
+                                                  preview_was_active ? 1 : 0);
     if (!preview_was_active) {
-      histogram_tester().ExpectTotalCount(histogram, 0);
+      tester()->histogram_tester().ExpectTotalCount(histogram, 0);
     } else {
-      histogram_tester().ExpectUniqueSample(
+      tester()->histogram_tester().ExpectUniqueSample(
           histogram,
           static_cast<base::HistogramBase::Sample>(
               event.value().InMilliseconds()),
@@ -140,12 +141,12 @@ class PreviewsPageLoadMetricsObserverTest
                               int network_resources,
                               int64_t network_bytes) {
     if (network_resources > 0) {
-      histogram_tester().ExpectUniqueSample(
+      tester()->histogram_tester().ExpectUniqueSample(
           "PageLoad.Clients." + preview_type_name +
               ".Experimental.Bytes.NetworkIncludingHeaders",
           static_cast<int>(network_bytes / 1024), 1);
     } else {
-      histogram_tester().ExpectTotalCount(
+      tester()->histogram_tester().ExpectTotalCount(
           "PageLoad.Clients." + preview_type_name +
               ".Experimental.Bytes.NetworkIncludingHeaders",
           0);
@@ -188,10 +189,10 @@ TEST_F(PreviewsPageLoadMetricsObserverTest, NoActivePreview) {
 
   auto resources =
       GetSampleResourceDataUpdateForTesting(10 * 1024 /* resource_size */);
-  SimulateResourceDataUseUpdate(resources);
+  tester()->SimulateResourceDataUseUpdate(resources);
 
-  SimulateTimingUpdate(timing_);
-  NavigateToUntrackedUrl();
+  tester()->SimulateTimingUpdate(timing_);
+  tester()->NavigateToUntrackedUrl();
 
   ValidateTimingHistograms("NoScriptPreview", false /* preview_was_active */);
   ValidateTimingHistograms("ResourceLoadingHintsPreview",
@@ -212,10 +213,10 @@ TEST_F(PreviewsPageLoadMetricsObserverTest, NoScriptPreviewActive) {
 
   auto resources =
       GetSampleResourceDataUpdateForTesting(10 * 1024 /* resource_size */);
-  SimulateResourceDataUseUpdate(resources);
+  tester()->SimulateResourceDataUseUpdate(resources);
 
-  SimulateTimingUpdate(timing_);
-  NavigateToUntrackedUrl();
+  tester()->SimulateTimingUpdate(timing_);
+  tester()->NavigateToUntrackedUrl();
 
   ValidateTimingHistograms("NoScriptPreview", true /* preview_was_active */);
   ValidateDataHistograms("NoScriptPreview", 1 /* network_resources */,
@@ -232,10 +233,10 @@ TEST_F(PreviewsPageLoadMetricsObserverTest, ResourceLoadingHintsPreviewActive) {
 
   auto resources =
       GetSampleResourceDataUpdateForTesting(10 * 1024 /* resource_size */);
-  SimulateResourceDataUseUpdate(resources);
+  tester()->SimulateResourceDataUseUpdate(resources);
 
-  SimulateTimingUpdate(timing_);
-  NavigateToUntrackedUrl();
+  tester()->SimulateTimingUpdate(timing_);
+  tester()->NavigateToUntrackedUrl();
 
   ValidateTimingHistograms("ResourceLoadingHintsPreview",
                            true /* preview_was_active */);
@@ -263,7 +264,7 @@ TEST_F(PreviewsPageLoadMetricsObserverTest, NoScriptDataSavings) {
   auto resource_data_update = ResourceDataUpdate::New();
   resource_data_update->delta_bytes = 5 * 1024;
   resources.push_back(std::move(resource_data_update));
-  SimulateResourceDataUseUpdate(resources);
+  tester()->SimulateResourceDataUseUpdate(resources);
   data_use += (5 * 1024);
 
   resources.clear();
@@ -271,10 +272,10 @@ TEST_F(PreviewsPageLoadMetricsObserverTest, NoScriptDataSavings) {
   resource_data_update = ResourceDataUpdate::New();
   resource_data_update->delta_bytes = 20 * 1024;
   resources.push_back(std::move(resource_data_update));
-  SimulateResourceDataUseUpdate(resources);
+  tester()->SimulateResourceDataUseUpdate(resources);
   data_use += (20 * 1024);
 
-  SimulateTimingUpdate(timing_);
+  tester()->SimulateTimingUpdate(timing_);
 
   int64_t expected_savings = (data_use * inflation) / 100 + constant_savings;
 
@@ -302,7 +303,7 @@ TEST_F(PreviewsPageLoadMetricsObserverTest, ResourceLoadingHintsDataSavings) {
   auto resource_data_update = ResourceDataUpdate::New();
   resource_data_update->delta_bytes = 5 * 1024;
   resources.push_back(std::move(resource_data_update));
-  SimulateResourceDataUseUpdate(resources);
+  tester()->SimulateResourceDataUseUpdate(resources);
   data_use += (5 * 1024);
 
   resources.clear();
@@ -310,10 +311,10 @@ TEST_F(PreviewsPageLoadMetricsObserverTest, ResourceLoadingHintsDataSavings) {
   resource_data_update = ResourceDataUpdate::New();
   resource_data_update->delta_bytes = 20 * 1024;
   resources.push_back(std::move(resource_data_update));
-  SimulateResourceDataUseUpdate(resources);
+  tester()->SimulateResourceDataUseUpdate(resources);
   data_use += (20 * 1024);
 
-  SimulateTimingUpdate(timing_);
+  tester()->SimulateTimingUpdate(timing_);
 
   int64_t expected_savings = (data_use * inflation) / 100 + constant_savings;
 

chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer_unittest.cc

@@ -49,7 +49,7 @@ class ProtocolPageLoadMetricsObserverTest
 
     page_load_metrics::mojom::PageLoadTiming timing;
     InitializeTestPageLoadTiming(&timing);
-    SimulateTimingUpdate(timing);
+    tester()->SimulateTimingUpdate(timing);
 
     // Navigate again to force OnComplete, which happens when a new navigation
     // occurs.
@@ -60,7 +60,7 @@ class ProtocolPageLoadMetricsObserverTest
     int count = 0;
 
     base::HistogramTester::CountsMap counts_map =
-        histogram_tester().GetTotalCountsForPrefix(
+        tester()->histogram_tester().GetTotalCountsForPrefix(
             "PageLoad.Clients.Protocol.");
     for (const auto& entry : counts_map)
       count += entry.second;
@@ -75,21 +75,21 @@ class ProtocolPageLoadMetricsObserverTest
     std::string prefix = "PageLoad.Clients.Protocol.";
     prefix += protocol;
 
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         prefix + ".ParseTiming.NavigationToParseStart", 1);
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         prefix + ".PaintTiming.ParseStartToFirstContentfulPaint", 1);
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         prefix + ".PaintTiming.NavigationToFirstContentfulPaint", 1);
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         prefix + ".Experimental.PaintTiming.ParseStartToFirstMeaningfulPaint",
         1);
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         prefix + ".Experimental.PaintTiming.NavigationToFirstMeaningfulPaint",
         1);
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         prefix + ".DocumentTiming.NavigationToDOMContentLoadedEventFired", 1);
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         prefix + ".DocumentTiming.NavigationToLoadEventFired", 1);
   }
 

chrome/browser/page_load_metrics/observers/scheme_page_load_metrics_observer_unittest.cc

@@ -48,7 +48,7 @@ class SchemePageLoadMetricsObserverTest
 
     page_load_metrics::mojom::PageLoadTiming timing;
     InitializeTestPageLoadTiming(&timing);
-    SimulateTimingUpdate(timing);
+    tester()->SimulateTimingUpdate(timing);
 
     // Navigate again to force OnComplete, which happens when a new navigation
     // occurs.
@@ -59,13 +59,14 @@ class SchemePageLoadMetricsObserverTest
   int CountTotalProtocolMetricsRecorded(const std::string& protocol) {
     int count = 0;
     base::HistogramTester::CountsMap counts_map =
-        histogram_tester().GetTotalCountsForPrefix("PageLoad.Clients.Scheme.");
+        tester()->histogram_tester().GetTotalCountsForPrefix(
+            "PageLoad.Clients.Scheme.");
     for (const auto& entry : counts_map)
       count += entry.second;
 
     int understat_count = 0;
     base::HistogramTester::CountsMap understat_counts_map =
-        histogram_tester().GetTotalCountsForPrefix(
+        tester()->histogram_tester().GetTotalCountsForPrefix(
             "PageLoad.Clients.Scheme." + base::ToUpperASCII(protocol) +
             ".PaintTiming.UnderStat");
     for (const auto& entry : understat_counts_map)
@@ -77,10 +78,10 @@ class SchemePageLoadMetricsObserverTest
   // Returns the value of the sample present in |histogram_name|. Should be
   // called only if |histogram_name| contains exactly 1 sample.
   int32_t GetRecordedMetricValue(const std::string& histogram_name) const {
-    histogram_tester().ExpectTotalCount(histogram_name, 1);
+    tester()->histogram_tester().ExpectTotalCount(histogram_name, 1);
 
     std::vector<base::Bucket> buckets =
-        histogram_tester().GetAllSamples(histogram_name);
+        tester()->histogram_tester().GetAllSamples(histogram_name);
     for (const auto& bucket : buckets) {
       if (bucket.count == 1) {
         return bucket.min;
@@ -106,25 +107,26 @@ class SchemePageLoadMetricsObserverTest
     std::string fcp_understat_new_nav_histogram_name(
         fcp_understat_histogram_name + ".UserInitiated.NewNavigation");
 
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         prefix + ".ParseTiming.NavigationToParseStart", 1);
-    histogram_tester().ExpectTotalCount(fcp_histogram_name, 1);
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(fcp_histogram_name, 1);
+    tester()->histogram_tester().ExpectTotalCount(
         prefix + ".PaintTiming.ParseStartToFirstContentfulPaint", 1);
-    histogram_tester().ExpectUniqueSample(
+    tester()->histogram_tester().ExpectUniqueSample(
         prefix + ".PaintTiming.ParseStartToFirstContentfulPaint",
         static_cast<base::HistogramBase::Sample>(200), 1);
-    histogram_tester().ExpectTotalCount(
+    tester()->histogram_tester().ExpectTotalCount(
         prefix + ".Experimental.PaintTiming.NavigationToFirstMeaningfulPaint",
         1);
 
-    histogram_tester().ExpectBucketCount(fcp_understat_histogram_name, 0, 1);
+    tester()->histogram_tester().ExpectBucketCount(fcp_understat_histogram_name,
+                                                   0, 1);
     if (new_navigation) {
-      histogram_tester().ExpectBucketCount(fcp_understat_new_nav_histogram_name,
-                                           0, 1);
+      tester()->histogram_tester().ExpectBucketCount(
+          fcp_understat_new_nav_histogram_name, 0, 1);
     } else {
-      histogram_tester().ExpectTotalCount(fcp_understat_new_nav_histogram_name,
-                                          0);
+      tester()->histogram_tester().ExpectTotalCount(
+          fcp_understat_new_nav_histogram_name, 0);
     }
 
     // Must remain synchronized with the array of the same name in
@@ -140,10 +142,10 @@ class SchemePageLoadMetricsObserverTest
       base::TimeDelta threshold(base::TimeDelta::FromSeconds(
           kUnderStatRecordingIntervalsSeconds[index]));
       if (recorded_fcp_value <= threshold) {
-        histogram_tester().ExpectBucketCount(fcp_understat_histogram_name,
-                                             index + 1, 1);
+        tester()->histogram_tester().ExpectBucketCount(
+            fcp_understat_histogram_name, index + 1, 1);
         if (new_navigation) {
-          histogram_tester().ExpectBucketCount(
+          tester()->histogram_tester().ExpectBucketCount(
               fcp_understat_new_nav_histogram_name, index + 1, 1);
         }
       }
@@ -152,7 +154,7 @@ class SchemePageLoadMetricsObserverTest
     // Overflow bucket should be empty. This also ensures that
     // kUnderStatRecordingIntervalsSeconds above is synchronized with the array
     // of the same name in scheme_page_load_metrics_observer.cc.
-    histogram_tester().ExpectBucketCount(
+    tester()->histogram_tester().ExpectBucketCount(
         fcp_understat_histogram_name,
         base::size(kUnderStatRecordingIntervalsSeconds) + 1, 0);
   }

chrome/browser/page_load_metrics/observers/session_restore_page_load_metrics_observer_unittest.cc

@@ -19,11 +19,11 @@
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h"
-#include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_tester.h"
 #include "chrome/browser/resource_coordinator/tab_manager.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/page_load_metrics/browser/observers/page_load_metrics_observer_tester.h"
 #include "components/page_load_metrics/browser/page_load_tracker.h"
 #include "components/page_load_metrics/common/test/page_load_metrics_test_util.h"
 #include "content/public/browser/browser_url_handler.h"
@@ -160,7 +160,7 @@ class SessionRestorePageLoadMetricsObserverTest
 
 TEST_F(SessionRestorePageLoadMetricsObserverTest, NoMetrics) {
   ExpectFirstPaintMetricsTotalCount(0);
-  EXPECT_EQ(0ul, test_ukm_recorder().entries_count());
+  EXPECT_EQ(0ul, tester()->test_ukm_recorder().entries_count());
 }
 
 TEST_F(SessionRestorePageLoadMetricsObserverTest,
@@ -169,7 +169,7 @@ TEST_F(SessionRestorePageLoadMetricsObserverTest,
       GetTestURL(), web_contents()->GetMainFrame());
   ASSERT_NO_FATAL_FAILURE(SimulateTimingUpdateForTab(web_contents()));
   ExpectFirstPaintMetricsTotalCount(0);
-  EXPECT_EQ(0ul, test_ukm_recorder().entries_count());
+  EXPECT_EQ(0ul, tester()->test_ukm_recorder().entries_count());
 }
 
 TEST_F(SessionRestorePageLoadMetricsObserverTest, RestoreSingleForegroundTab) {
@@ -177,9 +177,9 @@ TEST_F(SessionRestorePageLoadMetricsObserverTest, RestoreSingleForegroundTab) {
   ASSERT_NO_FATAL_FAILURE(RestoreTab(web_contents()));
   ASSERT_NO_FATAL_FAILURE(SimulateTimingUpdateForTab(web_contents()));
   ExpectFirstPaintMetricsTotalCount(1);
-  EXPECT_EQ(1ul, test_ukm_recorder().entries_count());
+  EXPECT_EQ(1ul, tester()->test_ukm_recorder().entries_count());
   ukm::TestUkmRecorder::ExpectEntryMetric(
-      test_ukm_recorder().GetEntriesByName(UkmEntry::kEntryName)[0],
+      tester()->test_ukm_recorder().GetEntriesByName(UkmEntry::kEntryName)[0],
       UkmEntry::kSessionRestoreTabCountName, 1);
 }
 
@@ -193,9 +193,9 @@ TEST_F(SessionRestorePageLoadMetricsObserverTest,
     ASSERT_NO_FATAL_FAILURE(RestoreTab(contents));
     ASSERT_NO_FATAL_FAILURE(SimulateTimingUpdateForTab(contents));
     ExpectFirstPaintMetricsTotalCount(i + 1);
-    EXPECT_EQ(i + 1, test_ukm_recorder().entries_count());
+    EXPECT_EQ(i + 1, tester()->test_ukm_recorder().entries_count());
     ukm::TestUkmRecorder::ExpectEntryMetric(
-        test_ukm_recorder().GetEntriesByName(UkmEntry::kEntryName)[i],
+        tester()->test_ukm_recorder().GetEntriesByName(UkmEntry::kEntryName)[i],
         UkmEntry::kSessionRestoreTabCountName, i + 1);
   }
 }
@@ -210,7 +210,7 @@ TEST_F(SessionRestorePageLoadMetricsObserverTest, RestoreBackgroundTab) {
 
   // No paint timings recorded for tabs restored in background.
   ExpectFirstPaintMetricsTotalCount(0);
-  EXPECT_EQ(0ul, test_ukm_recorder().entries_count());
+  EXPECT_EQ(0ul, tester()->test_ukm_recorder().entries_count());
 }
 
 TEST_F(SessionRestorePageLoadMetricsObserverTest, HideTabBeforeFirstPaints) {
@@ -243,7 +243,7 @@ TEST_F(SessionRestorePageLoadMetricsObserverTest,
   // No paint timings recorded because the initial foreground tab was hidden.
   ASSERT_NO_FATAL_FAILURE(SimulateTimingUpdateForTab(web_contents()));
   ExpectFirstPaintMetricsTotalCount(0);
-  EXPECT_EQ(0ul, test_ukm_recorder().entries_count());
+  EXPECT_EQ(0ul, tester()->test_ukm_recorder().entries_count());
 }
 
 TEST_F(SessionRestorePageLoadMetricsObserverTest, MultipleSessionRestores) {
@@ -256,9 +256,10 @@ TEST_F(SessionRestorePageLoadMetricsObserverTest, MultipleSessionRestores) {
 
     // Number of paint timings should match the number of session restores.
     ExpectFirstPaintMetricsTotalCount(i);
-    EXPECT_EQ(i, test_ukm_recorder().entries_count());
+    EXPECT_EQ(i, tester()->test_ukm_recorder().entries_count());
     ukm::TestUkmRecorder::ExpectEntryMetric(
-        test_ukm_recorder().GetEntriesByName(UkmEntry::kEntryName)[i - 1],
+        tester()->test_ukm_recorder().GetEntriesByName(
+            UkmEntry::kEntryName)[i - 1],
         UkmEntry::kSessionRestoreTabCountName, i);
   }
 }

chrome/browser/page_load_metrics/observers/subresource_loading_page_load_metrics_observer_unittest.cc

@@ -44,7 +44,7 @@ class SubresourceLoadingPageLoadMetricsObserverTest
     }
 
     NavigateAndCommit(navigation_url_);
-    SimulateTimingUpdate(timing_);
+    tester()->SimulateTimingUpdate(timing_);
   }
 
   page_load_metrics::mojom::ResourceDataUpdatePtr CreateCSSResource(
@@ -131,13 +131,13 @@ TEST_F(SubresourceLoadingPageLoadMetricsObserverTest, BeforeFCP_CSS) {
                                         true /* is_complete */,
                                         true /* completed_before_fcp */));
 
-  SimulateResourceDataUseUpdate(resources);
-  NavigateToUntrackedUrl();
+  tester()->SimulateResourceDataUseUpdate(resources);
+  tester()->NavigateToUntrackedUrl();
 
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Noncached", 2,
       1);
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Cached", 3, 1);
 }
 
@@ -162,13 +162,13 @@ TEST_F(SubresourceLoadingPageLoadMetricsObserverTest, BeforeFCP_JS) {
                                        true /* is_complete */,
                                        true /* completed_before_fcp */));
 
-  SimulateResourceDataUseUpdate(resources);
-  NavigateToUntrackedUrl();
+  tester()->SimulateResourceDataUseUpdate(resources);
+  tester()->NavigateToUntrackedUrl();
 
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Noncached", 2,
       1);
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Cached", 3, 1);
 }
 
@@ -193,13 +193,13 @@ TEST_F(SubresourceLoadingPageLoadMetricsObserverTest, BeforeFCP_Other) {
                                           true /* is_complete */,
                                           true /* completed_before_fcp */));
 
-  SimulateResourceDataUseUpdate(resources);
-  NavigateToUntrackedUrl();
+  tester()->SimulateResourceDataUseUpdate(resources);
+  tester()->NavigateToUntrackedUrl();
 
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Noncached", 0,
       1);
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Cached", 0, 1);
 }
 
@@ -224,13 +224,13 @@ TEST_F(SubresourceLoadingPageLoadMetricsObserverTest, BeforeFCP_NotComplete) {
                                         false /* is_complete */,
                                         false /* completed_before_fcp */));
 
-  SimulateResourceDataUseUpdate(resources);
-  NavigateToUntrackedUrl();
+  tester()->SimulateResourceDataUseUpdate(resources);
+  tester()->NavigateToUntrackedUrl();
 
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Noncached", 0,
       1);
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Cached", 0, 1);
 }
 
@@ -256,13 +256,13 @@ TEST_F(SubresourceLoadingPageLoadMetricsObserverTest, BeforeFCP_Subframe) {
                                         true /* is_complete */,
                                         true /* completed_before_fcp */));
 
-  SimulateResourceDataUseUpdate(resources);
-  NavigateToUntrackedUrl();
+  tester()->SimulateResourceDataUseUpdate(resources);
+  tester()->NavigateToUntrackedUrl();
 
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Noncached", 0,
       1);
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Cached", 0, 1);
 }
 
@@ -287,13 +287,13 @@ TEST_F(SubresourceLoadingPageLoadMetricsObserverTest, AfterFCP) {
                                         true /* is_complete */,
                                         false /* completed_before_fcp */));
 
-  SimulateResourceDataUseUpdate(resources);
-  NavigateToUntrackedUrl();
+  tester()->SimulateResourceDataUseUpdate(resources);
+  tester()->NavigateToUntrackedUrl();
 
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Noncached", 0,
       1);
-  histogram_tester().ExpectUniqueSample(
+  tester()->histogram_tester().ExpectUniqueSample(
       "PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Cached", 0, 1);
 }
 
@@ -320,11 +320,11 @@ TEST_F(SubresourceLoadingPageLoadMetricsObserverTest, DontRecordForNonHttp) {
                                         true /* is_complete */,
                                         true /* completed_before_fcp */));
 
-  SimulateResourceDataUseUpdate(resources);
-  NavigateToUntrackedUrl();
+  tester()->SimulateResourceDataUseUpdate(resources);
+  tester()->NavigateToUntrackedUrl();
 
-  histogram_tester().ExpectTotalCount(
+  tester()->histogram_tester().ExpectTotalCount(
       "PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Noncached", 0);
-  histogram_tester().ExpectTotalCount(
+  tester()->histogram_tester().ExpectTotalCount(
       "PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Cached", 0);
 }

components/page_load_metrics/browser/DEPS

@@ -3,6 +3,7 @@ include_rules = [
   "+content/public/browser",
   "+content/public/test",
   "+components/data_reduction_proxy/core/browser",
+  "+components/ukm",
   "+net",
   "+services/metrics",
   "+third_party/blink/public",