Revert 75393 - Cancel prerender if any of the visited URLs are https....

chrome/browser/prerender/prerender_resource_handler.cc

 // Copyright (c) 2011 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/prerender/prerender_resource_handler.h"
 
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/common/resource_response.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 
 namespace prerender {
 
 namespace {
 
-bool ShouldPrerenderURL(const GURL& url) {
-  if (!url.is_valid())
-    return false;
-  if (!url.SchemeIs("http")) {
-    RecordFinalStatus(FINAL_STATUS_HTTPS);
-    return false;
-  }
-  return true;
-}
-
-bool ValidateAliasURLs(const std::vector<GURL>& urls) {
-  for (std::vector<GURL>::const_iterator it = urls.begin();
-       it != urls.end();
-       ++it) {
-    if (!ShouldPrerenderURL(*it))
-      return false;
-  }
-  return true;
-}
-
-bool ShouldPrerender(const ResourceResponse* response) {
+bool ShouldPrerender(const GURL& url, const ResourceResponse* response) {
   if (!response)
     return false;
   const ResourceResponseHead& rrh = response->response_head;
+  if (!url.is_valid())
+    return false;
   if (!rrh.headers)
     return false;
+  if (!(url.SchemeIs("http") || url.SchemeIs("https")))
+    return false;
   if (rrh.mime_type != "text/html")
     return false;
   if (rrh.headers->response_code() != 200)
     return false;
   return true;
 }
 
 }  // namespace
 
 PrerenderResourceHandler* PrerenderResourceHandler::MaybeCreate(
     const net::URLRequest& request,
     ChromeURLRequestContext* context,
     ResourceHandler* next_handler) {
   if (!context || !context->prerender_manager())
     return NULL;
   if (!(request.load_flags() & net::LOAD_PREFETCH))
     return NULL;
-  if (!ShouldPrerenderURL(request.url()))
-    return NULL;
   if (request.method() != "GET")
     return NULL;
   return new PrerenderResourceHandler(request,
                                       next_handler,
                                       context->prerender_manager());
 }
 
 PrerenderResourceHandler::PrerenderResourceHandler(
     const net::URLRequest& request,
     ResourceHandler* next_handler,
@@ skipping 28 matching lines @@
   return next_handler_->OnUploadProgress(request_id, position, size);
 }
 
 bool PrerenderResourceHandler::OnRequestRedirected(int request_id,
                                                    const GURL& url,
                                                    ResourceResponse* response,
                                                    bool* defer) {
   bool will_redirect = next_handler_->OnRequestRedirected(
       request_id, url, response, defer);
   if (will_redirect) {
-    if (!ShouldPrerenderURL(url))
-      return false;
     alias_urls_.push_back(url);
     url_ = url;
   }
   return will_redirect;
 }
 
 bool PrerenderResourceHandler::OnResponseStarted(int request_id,
                                                  ResourceResponse* response) {
-  if (ShouldPrerender(response)) {
-    DCHECK(ValidateAliasURLs(alias_urls_));
+  if (ShouldPrerender(url_, response)) {
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         NewRunnableMethod(
             this,
             &PrerenderResourceHandler::RunCallbackFromUIThread,
             url_,
             alias_urls_,
             GURL(request_.referrer())));
   }
   return next_handler_->OnResponseStarted(request_id, response);
 }
 
 bool PrerenderResourceHandler::OnWillStart(int request_id,
                                            const GURL& url,
                                            bool* defer) {
   bool will_start = next_handler_->OnWillStart(request_id, url, defer);
   if (will_start) {
-    if (!ShouldPrerenderURL(url))
-      return false;
     alias_urls_.push_back(url);
     url_ = url;
   }
   return will_start;
 }
 
 bool PrerenderResourceHandler::OnWillRead(int request_id,
                                           net::IOBuffer** buf,
                                           int* buf_size,
                                           int min_size) {
@@ skipping 26 matching lines @@
 
 void PrerenderResourceHandler::StartPrerender(
     const GURL& url,
     const std::vector<GURL>& alias_urls,
     const GURL& referrer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   prerender_manager_->AddPreload(url, alias_urls, referrer);
 }
 
 }  // namespace prerender