Create LoadingDataCollector class and have observers rely on it instead of ResourcePrefetchPredictor

chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer.cc

Index: chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer.cc
diff --git a/chrome/browser/page_load_metrics/observers/resource_prefetch_predictor_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer.cc
similarity index 72%
rename from chrome/browser/page_load_metrics/observers/resource_prefetch_predictor_page_load_metrics_observer.cc
rename to chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer.cc
index faa430279c52fb484ed14835d2e6513849173696..aaaa98bfecca6c4a2e2c9918c5ecb3a051fa3c35 100644
--- a/chrome/browser/page_load_metrics/observers/resource_prefetch_predictor_page_load_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer.cc
@@ -2,7 +2,7 @@
 // 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/resource_prefetch_predictor_page_load_metrics_observer.h"
+#include "chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer.h"
 
 #include <memory>
 
@@ -26,32 +26,36 @@ const char kHistogramResourcePrefetchPredictorFirstMeaningfulPaint[] =
 }  // namespace internal
 
 // static
-std::unique_ptr<ResourcePrefetchPredictorPageLoadMetricsObserver>
-ResourcePrefetchPredictorPageLoadMetricsObserver::CreateIfNeeded(
+std::unique_ptr<LoadingPredictorPageLoadMetricsObserver>
+LoadingPredictorPageLoadMetricsObserver::CreateIfNeeded(
     content::WebContents* web_contents) {
   auto* loading_predictor = predictors::LoadingPredictorFactory::GetForProfile(
       Profile::FromBrowserContext(web_contents->GetBrowserContext()));
   if (!loading_predictor)
     return nullptr;
-  return base::MakeUnique<ResourcePrefetchPredictorPageLoadMetricsObserver>(
-      loading_predictor->resource_prefetch_predictor(), web_contents);
+  return base::MakeUnique<LoadingPredictorPageLoadMetricsObserver>(
+      loading_predictor->resource_prefetch_predictor(),
+      loading_predictor->loading_data_collector(), web_contents);
 }
 
-ResourcePrefetchPredictorPageLoadMetricsObserver::
-    ResourcePrefetchPredictorPageLoadMetricsObserver(
+LoadingPredictorPageLoadMetricsObserver::
+    LoadingPredictorPageLoadMetricsObserver(
         predictors::ResourcePrefetchPredictor* predictor,
+        predictors::LoadingDataCollector* collector,
         content::WebContents* web_contents)
     : predictor_(predictor),
+      collector_(collector),
       web_contents_(web_contents),
       record_histograms_(false) {
   DCHECK(predictor_);
+  DCHECK(collector_);
 }
 
-ResourcePrefetchPredictorPageLoadMetricsObserver::
-    ~ResourcePrefetchPredictorPageLoadMetricsObserver() {}
+LoadingPredictorPageLoadMetricsObserver::
+    ~LoadingPredictorPageLoadMetricsObserver() {}
 
 page_load_metrics::PageLoadMetricsObserver::ObservePolicy
-ResourcePrefetchPredictorPageLoadMetricsObserver::OnStart(
+LoadingPredictorPageLoadMetricsObserver::OnStart(
     content::NavigationHandle* navigation_handle,
     const GURL& currently_commited_url,
     bool started_in_foreground) {
@@ -63,20 +67,19 @@ ResourcePrefetchPredictorPageLoadMetricsObserver::OnStart(
 }
 
 page_load_metrics::PageLoadMetricsObserver::ObservePolicy
-ResourcePrefetchPredictorPageLoadMetricsObserver::OnHidden(
+LoadingPredictorPageLoadMetricsObserver::OnHidden(
     const page_load_metrics::mojom::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& extra_info) {
   record_histograms_ = false;
   return CONTINUE_OBSERVING;
 }
 
-void ResourcePrefetchPredictorPageLoadMetricsObserver::
-    OnFirstContentfulPaintInPage(
-        const page_load_metrics::mojom::PageLoadTiming& timing,
-        const page_load_metrics::PageLoadExtraInfo& extra_info) {
+void LoadingPredictorPageLoadMetricsObserver::OnFirstContentfulPaintInPage(
+    const page_load_metrics::mojom::PageLoadTiming& timing,
+    const page_load_metrics::PageLoadExtraInfo& extra_info) {
   predictors::NavigationID navigation_id(web_contents_);
 
-  predictor_->RecordFirstContentfulPaint(
+  collector_->RecordFirstContentfulPaint(
       navigation_id, extra_info.navigation_start +
                          timing.paint_timing->first_contentful_paint.value());
   if (record_histograms_) {
@@ -86,7 +89,7 @@ void ResourcePrefetchPredictorPageLoadMetricsObserver::
   }
 }
 
-void ResourcePrefetchPredictorPageLoadMetricsObserver::
+void LoadingPredictorPageLoadMetricsObserver::
     OnFirstMeaningfulPaintInMainFrameDocument(
         const page_load_metrics::mojom::PageLoadTiming& timing,
         const page_load_metrics::PageLoadExtraInfo& extra_info) {