predictors: Don't record URLs with a port.

chrome/browser/predictors/resource_prefetch_predictor.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/predictors/resource_prefetch_predictor.h"
 
 #include <map>
 #include <set>
 #include <utility>
 
@@ skipping 34 matching lines @@
                                 "font/woff",
                                 "font/ttf",
                                 "application/x-font-otf",
                                 "x-font/woff",
                                 "application/font-sfnt",
                                 "application/font-ttf"};
 
 const size_t kNumSampleHosts = 50;
 const size_t kReportReadinessThreshold = 50;
 
+bool g_allow_port_in_urls = false;

[alexilin, 2017/03/15 17:56:26]

Why global flag and static setter instead of member field and method?
Having non const global is additional mental load for me.

+
 // For reporting events of interest that are not tied to any navigation.
 enum ReportingEvent {
   REPORTING_EVENT_ALL_HISTORY_CLEARED = 0,
   REPORTING_EVENT_PARTIAL_HISTORY_CLEARED = 1,
   REPORTING_EVENT_COUNT = 2
 };
 
 float ComputeRedirectConfidence(const predictors::RedirectStat& redirect) {
   return (redirect.number_of_hits() + 0.0) /
          (redirect.number_of_hits() + redirect.number_of_misses());
@@ skipping 201 matching lines @@
 
   if (!request_info->IsMainFrame())
     return false;
 
   return request_info->GetResourceType() == content::RESOURCE_TYPE_MAIN_FRAME &&
       IsHandledMainPage(response);
 }
 
 // static
 bool ResourcePrefetchPredictor::IsHandledMainPage(net::URLRequest* request) {
-  return request->url().SchemeIsHTTPOrHTTPS();
+  const GURL& url = request->url();
+  bool bad_port = !g_allow_port_in_urls && url.has_port();
+  return url.SchemeIsHTTPOrHTTPS() && !bad_port;
 }
 
 // static
 bool ResourcePrefetchPredictor::IsHandledSubresource(
     net::URLRequest* response,
     content::ResourceType resource_type) {
+  const GURL& url = response->url();
+  bool bad_port = !g_allow_port_in_urls && url.has_port();
   if (!response->first_party_for_cookies().SchemeIsHTTPOrHTTPS() ||
-      !response->url().SchemeIsHTTPOrHTTPS())
+      !url.SchemeIsHTTPOrHTTPS() || bad_port) {
     return false;
+  }
 
   std::string mime_type;
   response->GetMimeType(&mime_type);
   if (!IsHandledResourceType(resource_type, mime_type))
     return false;
 
   if (response->method() != "GET")
     return false;
 
   if (response->original_url().spec().length() >
@@ skipping 95 matching lines @@
   if (best_redirect == redirect_data.redirect_endpoints().end() ||
       ComputeRedirectConfidence(*best_redirect) <
           kMinRedirectConfidenceToTriggerPrefetch ||
       best_redirect->number_of_hits() < kMinRedirectHitsToTriggerPrefetch)
     return false;
 
   *final_redirect = best_redirect->url();
   return true;
 }
 
+// static
+void ResourcePrefetchPredictor::SetAllowPortInUrlsForTesting(bool state) {
+  g_allow_port_in_urls = state;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ResourcePrefetchPredictor nested types.
 
 ResourcePrefetchPredictor::URLRequestSummary::URLRequestSummary()
     : resource_type(content::RESOURCE_TYPE_LAST_TYPE),
       priority(net::IDLE),
       was_cached(false),
       has_validators(false),
       always_revalidate(false) {}
 
@@ skipping 1021 matching lines @@
 TestObserver::~TestObserver() {
   predictor_->SetObserverForTesting(nullptr);
 }
 
 TestObserver::TestObserver(ResourcePrefetchPredictor* predictor)
     : predictor_(predictor) {
   predictor_->SetObserverForTesting(this);
 }
 
 }  // namespace predictors