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

chrome/browser/net/loading_predictor_observer.cc

Index: chrome/browser/net/loading_predictor_observer.cc
diff --git a/chrome/browser/net/loading_predictor_observer.cc b/chrome/browser/net/loading_predictor_observer.cc
index 8d48d012b78b4460bf46c516d9df92b4deda50d4..17cee492d5d3ce9cec1612fe2adc8035c6ad9175 100644
--- a/chrome/browser/net/loading_predictor_observer.cc
+++ b/chrome/browser/net/loading_predictor_observer.cc
@@ -22,6 +22,7 @@ class WebContents;
 using content::BrowserThread;
 using predictors::LoadingPredictor;
 using predictors::ResourcePrefetchPredictor;
+using predictors::LoadingDataCollector;
 using URLRequestSummary =
     predictors::ResourcePrefetchPredictor::URLRequestSummary;
 
@@ -98,7 +99,7 @@ void LoadingPredictorObserver::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>();
@@ -130,12 +131,11 @@ void LoadingPredictorObserver::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;
@@ -168,11 +168,10 @@ void LoadingPredictorObserver::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;
   }
 
@@ -202,7 +201,7 @@ void LoadingPredictorObserver::OnRequestStartedOnUIThread(
   }
   if (summary->resource_type == content::RESOURCE_TYPE_MAIN_FRAME)
     predictor_->OnMainFrameRequest(*summary);
-  predictor_->resource_prefetch_predictor()->RecordURLRequest(*summary);
+  predictor_->loading_data_collector()->RecordURLRequest(*summary);
 }
 
 void LoadingPredictorObserver::OnRequestRedirectedOnUIThread(
@@ -218,6 +217,7 @@ void LoadingPredictorObserver::OnRequestRedirectedOnUIThread(
   if (summary->resource_type == content::RESOURCE_TYPE_MAIN_FRAME)
     predictor_->OnMainFrameRedirect(*summary);
   predictor_->resource_prefetch_predictor()->RecordURLRedirect(*summary);

[Benoit L, 2017/06/02 12:43:59]

Shouldn't this be removed?

[trevordixon, 2017/06/06 13:08:03]

Yes. Merge mistake.

+  predictor_->loading_data_collector()->RecordURLRedirect(*summary);
 }
 
 void LoadingPredictorObserver::OnResponseStartedOnUIThread(
@@ -232,7 +232,7 @@ void LoadingPredictorObserver::OnResponseStartedOnUIThread(
   }
   if (summary->resource_type == content::RESOURCE_TYPE_MAIN_FRAME)
     predictor_->OnMainFrameResponse(*summary);
-  predictor_->resource_prefetch_predictor()->RecordURLResponse(*summary);
+  predictor_->loading_data_collector()->RecordURLResponse(*summary);
 }
 
 }  // namespace chrome_browser_net