predictors: Fix duplicate content type detection.

chrome/browser/net/resource_prefetch_predictor_observer.cc

 // Copyright 2014 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/resource_prefetch_predictor_observer.h"
 
 #include <string>
 
 #include "base/metrics/histogram.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 using predictors::ResourcePrefetchPredictor;
 
 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,
-  REQUEST_STATS_NO_RESOURCE_REQUEST_INFO = 2,
-  REQUEST_STATS_NO_RENDER_FRAME_ID_FROM_REQUEST_INFO = 3,
+  REQUEST_STATS_NO_RESOURCE_REQUEST_INFO = 2,  // Not recorded (never was).
+  REQUEST_STATS_NO_RENDER_FRAME_ID_FROM_REQUEST_INFO = 3,  // Not recorded.
   REQUEST_STATS_MAX = 4,
 };
 
 // Specific to main frame requests.
 enum MainFrameRequestStats {
   MAIN_FRAME_REQUEST_STATS_TOTAL_REQUESTS = 0,
   MAIN_FRAME_REQUEST_STATS_PROCESSED_REQUESTS = 1,
   MAIN_FRAME_REQUEST_STATS_TOTAL_REDIRECTS = 2,
   MAIN_FRAME_REQUEST_STATS_PROCESSED_REDIRECTS = 3,
   MAIN_FRAME_REQUEST_STATS_TOTAL_RESPONSES = 4,
   MAIN_FRAME_REQUEST_STATS_PROCESSED_RESPONSES = 5,
   MAIN_FRAME_REQUEST_STATS_MAX = 6,
 };
 
 void ReportRequestStats(RequestStats stat) {
   UMA_HISTOGRAM_ENUMERATION("ResourcePrefetchPredictor.RequestStats",
                             stat,
                             REQUEST_STATS_MAX);
 }
 
 void ReportMainFrameRequestStats(MainFrameRequestStats stat) {
   UMA_HISTOGRAM_ENUMERATION("ResourcePrefetchPredictor.MainFrameRequestStats",
                             stat,
                             MAIN_FRAME_REQUEST_STATS_MAX);
 }
 
-bool SummarizeResponse(net::URLRequest* request,
-                       ResourcePrefetchPredictor::URLRequestSummary* summary) {
-  const content::ResourceRequestInfo* info =
-      content::ResourceRequestInfo::ForRequest(request);
-  if (!info) {
-    ReportRequestStats(REQUEST_STATS_NO_RESOURCE_REQUEST_INFO);
-    return false;
-  }
-
-  int render_process_id, render_frame_id;
-  if (!info->GetAssociatedRenderFrame(&render_process_id, &render_frame_id)) {
-    ReportRequestStats(REQUEST_STATS_NO_RENDER_FRAME_ID_FROM_REQUEST_INFO);
-    return false;
-  }
-
-  summary->navigation_id.render_process_id = render_process_id;
-  summary->navigation_id.render_frame_id = render_frame_id;
-  summary->navigation_id.main_frame_url = request->first_party_for_cookies();
-  summary->navigation_id.creation_time = request->creation_time();
-  summary->resource_url = request->original_url();
-  summary->resource_type = info->GetResourceType();
-  summary->priority = request->priority();
-  request->GetMimeType(&summary->mime_type);
-  summary->was_cached = request->was_cached();
-
-  // Use the mime_type to determine the resource type for subresources since
-  // types such as PREFETCH, SUB_RESOURCE, etc are not useful.
-  if (summary->resource_type != content::RESOURCE_TYPE_MAIN_FRAME) {
-    summary->resource_type =
-        ResourcePrefetchPredictor::GetResourceTypeFromMimeType(
-            summary->mime_type,
-            summary->resource_type);
-  }
-  return true;
-}
-
 }  // namespace
 
 namespace chrome_browser_net {
 
 ResourcePrefetchPredictorObserver::ResourcePrefetchPredictorObserver(
     ResourcePrefetchPredictor* predictor)
     : predictor_(predictor->AsWeakPtr()) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
@@ skipping 43 matching lines @@
       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))
     return;
 
   ResourcePrefetchPredictor::URLRequestSummary summary;
-  if (!SummarizeResponse(request, &summary))
+  if (!ResourcePrefetchPredictor::URLRequestSummary::SummarizeResponse(
+          request, &summary)) {
     return;
+  }
 
   summary.redirect_url = redirect_url;
 
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&ResourcePrefetchPredictor::RecordURLRedirect,
                  predictor_,
                  summary));
 
@@ skipping 12 matching lines @@
   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))
     return;
   ResourcePrefetchPredictor::URLRequestSummary summary;
-  if (!SummarizeResponse(request, &summary))
+  if (!ResourcePrefetchPredictor::URLRequestSummary::SummarizeResponse(
+          request, &summary)) {
     return;
+  }
 
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&ResourcePrefetchPredictor::RecordURLResponse,
                  predictor_,
                  summary));
 
   ReportRequestStats(REQUEST_STATS_TOTAL_PROCESSED_RESPONSES);
   if (request_info &&
       request_info->GetResourceType() == content::RESOURCE_TYPE_MAIN_FRAME) {
     ReportMainFrameRequestStats(MAIN_FRAME_REQUEST_STATS_PROCESSED_RESPONSES);
   }
 }
 
 }  // namespace chrome_browser_net