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

chrome/browser/prerender/prerender_contents.cc

Index: chrome/browser/prerender/prerender_contents.cc
===================================================================
--- chrome/browser/prerender/prerender_contents.cc	(revision 75394)
+++ chrome/browser/prerender/prerender_contents.cc	(working copy)
@@ -48,11 +48,11 @@
       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);
   }
 }
 
@@ -151,12 +151,9 @@
   *p = params;
   navigate_params_.reset(p);
 
-  if (!AddAliasURL(params.url)) {
-    Destroy(FINAL_STATUS_HTTPS);
-    return;
-  }
-
   url_ = params.url;
+
+  AddAliasURL(url_);
 }
 
 void PrerenderContents::UpdateTitle(RenderViewHost* render_view_host,
@@ -343,19 +340,14 @@
 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,
@@ -363,11 +355,8 @@
   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 {