predictors: Remove the HTTP restriction for speculative prefetch.

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 25 matching lines @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // For reporting whether a subresource is handled or not, and for what reasons.
 enum ResourceStatus {
   RESOURCE_STATUS_HANDLED = 0,
-  RESOURCE_STATUS_NOT_HTTP_PAGE = 1,
-  RESOURCE_STATUS_NOT_HTTP_RESOURCE = 2,
+  RESOURCE_STATUS_NOT_HTTP_OR_HTTPS_PAGE = 1,
+  RESOURCE_STATUS_NOT_HTTP_OR_HTTPS_RESOURCE = 2,
   RESOURCE_STATUS_UNSUPPORTED_MIME_TYPE = 4,
   RESOURCE_STATUS_NOT_GET = 8,
   RESOURCE_STATUS_URL_TOO_LONG = 16,
   RESOURCE_STATUS_NOT_CACHEABLE = 32,
   RESOURCE_STATUS_HEADERS_MISSING = 64,
   RESOURCE_STATUS_MAX = 128,
 };
 
 // For reporting various interesting events that occur during the loading of a
 // single main frame.
@@ skipping 167 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->original_url().scheme() == url::kHttpScheme;
+  return request->url().SchemeIsHTTPOrHTTPS();
 }
 
 // static
 bool ResourcePrefetchPredictor::IsHandledSubresource(
     net::URLRequest* response) {
   int resource_status = 0;
-  if (response->first_party_for_cookies().scheme() != url::kHttpScheme)
-    resource_status |= RESOURCE_STATUS_NOT_HTTP_PAGE;
 
-  if (response->original_url().scheme() != url::kHttpScheme)
-    resource_status |= RESOURCE_STATUS_NOT_HTTP_RESOURCE;
+  if (!response->first_party_for_cookies().SchemeIsHTTPOrHTTPS())
+    resource_status |= RESOURCE_STATUS_NOT_HTTP_OR_HTTPS_PAGE;
+
+  if (!response->url().SchemeIsHTTPOrHTTPS())
+    resource_status |= RESOURCE_STATUS_NOT_HTTP_OR_HTTPS_RESOURCE;
 
   std::string mime_type;
   response->GetMimeType(&mime_type);
   if (!mime_type.empty() && !mime_util::IsSupportedImageMimeType(mime_type) &&
       !mime_util::IsSupportedJavascriptMimeType(mime_type) &&
       !net::MatchesMimeType("text/css", mime_type)) {
     resource_status |= RESOURCE_STATUS_UNSUPPORTED_MIME_TYPE;
   }
 
   if (response->method() != "GET")
@@ skipping 1077 matching lines @@
     // HistoryService is already loaded. Continue with Initialization.
     OnHistoryAndCacheLoaded();
     return;
   }
   DCHECK(!history_service_observer_.IsObserving(history_service));
   history_service_observer_.Add(history_service);
   return;
 }
 
 }  // namespace predictors