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

chrome/browser/predictors/loading_predictor.cc

 // Copyright 2017 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/predictors/loading_predictor.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
+#include "chrome/browser/predictors/loading_data_collector.h"
 #include "chrome/browser/predictors/loading_stats_collector.h"
 #include "chrome/browser/predictors/resource_prefetch_common.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor.h"
 
 namespace predictors {
 
 using URLRequestSummary = ResourcePrefetchPredictor::URLRequestSummary;
 
 LoadingPredictor::LoadingPredictor(const LoadingPredictorConfig& config,
                                    Profile* profile)
     : config_(config),
       profile_(profile),
       resource_prefetch_predictor_(
           base::MakeUnique<ResourcePrefetchPredictor>(config, profile)),
       stats_collector_(base::MakeUnique<LoadingStatsCollector>(
           resource_prefetch_predictor_.get(),
-          config)) {
+          config)),
+      loading_data_collector_(base::MakeUnique<LoadingDataCollector>(
+          resource_prefetch_predictor())) {
   resource_prefetch_predictor_->SetStatsCollector(stats_collector_.get());
 }
 
 LoadingPredictor::~LoadingPredictor() = default;
 
 void LoadingPredictor::PrepareForPageLoad(const GURL& url, HintOrigin origin) {
   if (active_hints_.find(url) != active_hints_.end())
     return;
   ResourcePrefetchPredictor::Prediction prediction;
   if (!resource_prefetch_predictor_->GetPrefetchData(url, &prediction))
     return;
 
   // To report hint durations.
   active_hints_.emplace(url, base::TimeTicks::Now());
 
   if (config_.IsPrefetchingEnabledForOrigin(profile_, origin))
     resource_prefetch_predictor_->StartPrefetching(url, prediction);
 }
 
 void LoadingPredictor::CancelPageLoadHint(const GURL& url) {
   CancelActiveHint(active_hints_.find(url));
 }
 
 void LoadingPredictor::StartInitialization() {
   resource_prefetch_predictor_->StartInitialization();
 }
 
-ResourcePrefetchPredictor* LoadingPredictor::resource_prefetch_predictor()
-    const {
+LoadingDataCollector* LoadingPredictor::loading_data_collector() {
+  return loading_data_collector_.get();
+}
+
+ResourcePrefetchPredictor* LoadingPredictor::resource_prefetch_predictor() {
   return resource_prefetch_predictor_.get();
 }
 
 void LoadingPredictor::Shutdown() {
   resource_prefetch_predictor_->Shutdown();
 }
 
 void LoadingPredictor::OnMainFrameRequest(const URLRequestSummary& summary) {
   DCHECK(summary.resource_type == content::RESOURCE_TYPE_MAIN_FRAME);
 
@@ skipping 71 matching lines @@
       const GURL& initial_url = it->second;
       CancelActiveHint(active_hints_.find(initial_url));
       it = active_navigations_.erase(it);
     } else {
       ++it;
     }
   }
 }
 
 }  // namespace predictors