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

chrome/browser/net/resource_prefetch_predictor_observer.cc

Index: chrome/browser/net/resource_prefetch_predictor_observer.cc
diff --git a/chrome/browser/net/resource_prefetch_predictor_observer.cc b/chrome/browser/net/resource_prefetch_predictor_observer.cc
index 4dc2b0bce2d2e7ad49ddf05f7d512f595eb6708d..9537a1cf2e7c794de63fcb6736bb02ea5443eca9 100644
--- a/chrome/browser/net/resource_prefetch_predictor_observer.cc
+++ b/chrome/browser/net/resource_prefetch_predictor_observer.cc
@@ -20,7 +20,7 @@ class WebContents;
 }
 
 using content::BrowserThread;
-using predictors::ResourcePrefetchPredictor;
+using predictors::LoadingDataCollector;
 using URLRequestSummary =
     predictors::ResourcePrefetchPredictor::URLRequestSummary;
 
@@ -80,8 +80,8 @@ bool TryToFillNavigationID(
 namespace chrome_browser_net {
 
 ResourcePrefetchPredictorObserver::ResourcePrefetchPredictorObserver(
-    ResourcePrefetchPredictor* predictor)
-    : predictor_(predictor->AsWeakPtr()) {
+    LoadingDataCollector* collector)
+    : collector_(collector->AsWeakPtr()) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
@@ -100,7 +100,7 @@ void ResourcePrefetchPredictorObserver::OnRequestStarted(
   if (resource_type == content::RESOURCE_TYPE_MAIN_FRAME)
     ReportMainFrameRequestStats(MAIN_FRAME_REQUEST_STATS_TOTAL_REQUESTS);
 
-  if (!ResourcePrefetchPredictor::ShouldRecordRequest(request, resource_type))
+  if (!LoadingDataCollector::ShouldRecordRequest(request, resource_type))
     return;
 
   auto summary = base::MakeUnique<URLRequestSummary>();
@@ -133,12 +133,11 @@ void ResourcePrefetchPredictorObserver::OnRequestRedirected(
     ReportMainFrameRequestStats(MAIN_FRAME_REQUEST_STATS_TOTAL_REDIRECTS);
   }
 
-  if (!ResourcePrefetchPredictor::ShouldRecordRedirect(request))
+  if (!LoadingDataCollector::ShouldRecordRedirect(request))
     return;
 
   auto summary = base::MakeUnique<URLRequestSummary>();
-  if (!ResourcePrefetchPredictor::URLRequestSummary::SummarizeResponse(
-          *request, summary.get())) {
+  if (!URLRequestSummary::SummarizeResponse(*request, summary.get())) {
     return;
   }
   summary->redirect_url = redirect_url;
@@ -172,11 +171,10 @@ void ResourcePrefetchPredictorObserver::OnResponseStarted(
     ReportMainFrameRequestStats(MAIN_FRAME_REQUEST_STATS_TOTAL_RESPONSES);
   }
 
-  if (!ResourcePrefetchPredictor::ShouldRecordResponse(request))
+  if (!LoadingDataCollector::ShouldRecordResponse(request))
     return;
   auto summary = base::MakeUnique<URLRequestSummary>();
-  if (!ResourcePrefetchPredictor::URLRequestSummary::SummarizeResponse(
-          *request, summary.get())) {
+  if (!URLRequestSummary::SummarizeResponse(*request, summary.get())) {
     return;
   }
 
@@ -205,7 +203,7 @@ void ResourcePrefetchPredictorObserver::OnRequestStartedOnUIThread(
                              main_frame_url, creation_time)) {
     return;
   }
-  predictor_->RecordURLRequest(*summary);
+  collector_->RecordURLRequest(*summary);
 }
 
 void ResourcePrefetchPredictorObserver::OnRequestRedirectedOnUIThread(
@@ -218,7 +216,7 @@ void ResourcePrefetchPredictorObserver::OnRequestRedirectedOnUIThread(
                              main_frame_url, creation_time)) {
     return;
   }
-  predictor_->RecordURLRedirect(*summary);
+  collector_->RecordURLRedirect(*summary);
 }
 
 void ResourcePrefetchPredictorObserver::OnResponseStartedOnUIThread(
@@ -231,7 +229,7 @@ void ResourcePrefetchPredictorObserver::OnResponseStartedOnUIThread(
                              main_frame_url, creation_time)) {
     return;
   }
-  predictor_->RecordURLResponse(*summary);
+  collector_->RecordURLResponse(*summary);
 }
 
 }  // namespace chrome_browser_net