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

chrome/browser/prerender/prerender_contents.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_contents.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/background_contents_service.h"
 #include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/prerender/prerender_final_status.h"
@@ skipping 30 matching lines @@
                                      const GURL& referrer)
     : prerender_manager_(prerender_manager),
       render_view_host_(NULL),
       prerender_url_(url),
       referrer_(referrer),
       profile_(profile),
       page_id_(0),
       has_stopped_loading_(false),
       final_status_(FINAL_STATUS_MAX) {
   DCHECK(prerender_manager != NULL);
-  DCHECK(AddAliasURL(prerender_url_));
+  AddAliasURL(prerender_url_);
   for (std::vector<GURL>::const_iterator it = alias_urls.begin();
        it != alias_urls.end();
        ++it) {
-    DCHECK(AddAliasURL(*it));
+    AddAliasURL(*it);
   }
 }
 
 // static
 PrerenderContents::Factory* PrerenderContents::CreateFactory() {
   return new PrerenderContentsFactoryImpl();
 }
 
 void PrerenderContents::StartPrerendering() {
   DCHECK(profile_ != NULL);
@@ skipping 78 matching lines @@
     const ViewHostMsg_FrameNavigate_Params& params) {
   // We only care when the outer frame changes.
   if (!PageTransition::IsMainFrame(params.transition))
     return;
 
   // Store the navigation params.
   ViewHostMsg_FrameNavigate_Params* p = new ViewHostMsg_FrameNavigate_Params();
   *p = params;
   navigate_params_.reset(p);
 
-  if (!AddAliasURL(params.url)) {
-    Destroy(FINAL_STATUS_HTTPS);
-    return;
-  }
+  url_ = params.url;
 
-  url_ = params.url;
+  AddAliasURL(url_);
 }
 
 void PrerenderContents::UpdateTitle(RenderViewHost* render_view_host,
                                     int32 page_id,
                                     const std::wstring& title) {
   if (title.empty()) {
     return;
   }
 
   title_ = WideToUTF16Hack(title);
@@ skipping 166 matching lines @@
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateFavIconURL, OnUpdateFavIconURL)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
 
   return handled;
 }
 
 void PrerenderContents::OnDidStartProvisionalLoadForFrame(int64 frame_id,
                                                           bool is_main_frame,
                                                           const GURL& url) {
-  if (is_main_frame) {
-    if (!AddAliasURL(url)) {
-      Destroy(FINAL_STATUS_HTTPS);
-      return;
-    }
-  }
+  if (is_main_frame)
+    AddAliasURL(url);
 }
 
 void PrerenderContents::OnDidRedirectProvisionalLoad(int32 page_id,
                                                      const GURL& source_url,
                                                      const GURL& target_url) {
-  if (!AddAliasURL(target_url))
-    Destroy(FINAL_STATUS_HTTPS);
+  AddAliasURL(target_url);
 }
 
 void PrerenderContents::OnUpdateFavIconURL(int32 page_id,
                                            const GURL& icon_url) {
   icon_url_ = icon_url;
 }
 
-bool PrerenderContents::AddAliasURL(const GURL& url) {
-  if (!url.SchemeIs("http"))
-    return false;
+void PrerenderContents::AddAliasURL(const GURL& url) {
   alias_urls_.push_back(url);
-  return true;
 }
 
 bool PrerenderContents::MatchesURL(const GURL& url) const {
   return std::find(alias_urls_.begin(), alias_urls_.end(), url)
       != alias_urls_.end();
 }
 
 void PrerenderContents::DidStopLoading() {
   has_stopped_loading_ = true;
 }
 
 void PrerenderContents::Destroy(FinalStatus final_status) {
   prerender_manager_->RemoveEntry(this);
   set_final_status(final_status);
   delete this;
 }
 
 }  // namespace prerender