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

chrome/browser/net/loading_predictor_observer.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/net/loading_predictor_observer.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_request_info.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 
 namespace content {
 class WebContents;
 }
 
 using content::BrowserThread;
 using predictors::LoadingPredictor;
 using predictors::ResourcePrefetchPredictor;
+using predictors::LoadingDataCollector;
 using URLRequestSummary =
     predictors::ResourcePrefetchPredictor::URLRequestSummary;
 
 namespace {
 
 // Enum for measuring statistics pertaining to observed request, responses and
 // redirects.
 enum RequestStats {
   REQUEST_STATS_TOTAL_RESPONSES = 0,
   REQUEST_STATS_TOTAL_PROCESSED_RESPONSES = 1,
@@ skipping 56 matching lines @@
 void LoadingPredictorObserver::OnRequestStarted(
     net::URLRequest* request,
     content::ResourceType resource_type,
     const content::ResourceRequestInfo::WebContentsGetter&
         web_contents_getter) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   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>();
   summary->resource_url = request->original_url();
   summary->resource_type = resource_type;
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::BindOnce(&LoadingPredictorObserver::OnRequestStartedOnUIThread,
                      base::Unretained(this), base::Passed(std::move(summary)),
@@ skipping 11 matching lines @@
         web_contents_getter) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   const content::ResourceRequestInfo* request_info =
       content::ResourceRequestInfo::ForRequest(request);
   if (request_info &&
       request_info->GetResourceType() == content::RESOURCE_TYPE_MAIN_FRAME) {
     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;
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::BindOnce(&LoadingPredictorObserver::OnRequestRedirectedOnUIThread,
                      base::Unretained(this), base::Passed(std::move(summary)),
                      web_contents_getter, request->first_party_for_cookies(),
                      request->creation_time()));
@@ skipping 12 matching lines @@
 
   ReportRequestStats(REQUEST_STATS_TOTAL_RESPONSES);
 
   const content::ResourceRequestInfo* request_info =
       content::ResourceRequestInfo::ForRequest(request);
   if (request_info &&
       request_info->GetResourceType() == content::RESOURCE_TYPE_MAIN_FRAME) {
     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;
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::BindOnce(&LoadingPredictorObserver::OnResponseStartedOnUIThread,
                      base::Unretained(this), base::Passed(std::move(summary)),
                      web_contents_getter, request->first_party_for_cookies(),
                      request->creation_time()));
 
   ReportRequestStats(REQUEST_STATS_TOTAL_PROCESSED_RESPONSES);
   if (request_info &&
       request_info->GetResourceType() == content::RESOURCE_TYPE_MAIN_FRAME) {
     ReportMainFrameRequestStats(MAIN_FRAME_REQUEST_STATS_PROCESSED_RESPONSES);
   }
 }
 
 void LoadingPredictorObserver::OnRequestStartedOnUIThread(
     std::unique_ptr<URLRequestSummary> summary,
     const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
     const GURL& main_frame_url,
     const base::TimeTicks& creation_time) const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!TryToFillNavigationID(&summary->navigation_id, web_contents_getter,
                              main_frame_url, creation_time)) {
     return;
   }
   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(
     std::unique_ptr<URLRequestSummary> summary,
     const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
     const GURL& main_frame_url,
     const base::TimeTicks& creation_time) const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!TryToFillNavigationID(&summary->navigation_id, web_contents_getter,
                              main_frame_url, creation_time)) {
     return;
   }
   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(
     std::unique_ptr<URLRequestSummary> summary,
     const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
     const GURL& main_frame_url,
     const base::TimeTicks& creation_time) const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!TryToFillNavigationID(&summary->navigation_id, web_contents_getter,
                              main_frame_url, creation_time)) {
     return;
   }
   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