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

chrome/browser/prerender/prerender_browsertest.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 "base/command_line.h"
 #include "base/path_service.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ skipping 96 matching lines @@
     command_line->AppendSwitchPath(
         switches::kExtraPluginDir,
         app_dir.Append(FILE_PATH_LITERAL("plugins")));
 #endif
   }
 
   void PrerenderTestURL(const std::string& html_file,
                         FinalStatus expected_final_status,
                         int total_navigations) {
     ASSERT_TRUE(test_server()->Start());
+    std::string src_path = "files/prerender/prerender_loader.html?";
+    src_path.append(html_file);
     std::string dest_path = "files/prerender/";
     dest_path.append(html_file);
+
+    GURL src_url = test_server()->GetURL(src_path);
     dest_url_ = test_server()->GetURL(dest_path);
 
-    std::vector<net::TestServer::StringPair> replacement_text;
-    replacement_text.push_back(
-        make_pair("REPLACE_WITH_PREFETCH_URL", dest_url_.spec()));
-    std::string replacement_path;
-    ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements(
-        "files/prerender/prerender_loader.html",
-        replacement_text,
-        &replacement_path));
-    GURL src_url = test_server()->GetURL(replacement_path);
-
     Profile* profile = browser()->GetSelectedTabContents()->profile();
     PrerenderManager* prerender_manager = profile->GetPrerenderManager();
     ASSERT_TRUE(prerender_manager);
 
     // This is needed to exit the event loop once the prerendered page has
     // stopped loading or was cancelled.
     prerender_manager->SetPrerenderContentsFactory(
         new WaitForLoadPrerenderContentsFactory(expected_final_status));
 
     // ui_test_utils::NavigateToURL uses its own observer and message loop.
@@ skipping 149 matching lines @@
                    FINAL_STATUS_USED, 1);
   NavigateToDestURL();
 }
 
 // Checks that popups on a prerendered page cause cancellation.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPopup) {
   PrerenderTestURL("prerender_popup.html",
                    FINAL_STATUS_CREATE_NEW_WINDOW, 1);
 }
 
-// Test that page-based redirects to https will cancel prerenders.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderRedirectToHttps) {
-  net::TestServer https_server(net::TestServer::TYPE_HTTPS,
-                               FilePath(FILE_PATH_LITERAL("chrome/test/data")));
-  ASSERT_TRUE(https_server.Start());
-  GURL https_url = https_server.GetURL("files/prerender/prerender_page.html");
-  std::vector<net::TestServer::StringPair> replacement_text;
-  replacement_text.push_back(
-      make_pair("REPLACE_WITH_HTTPS_URL", https_url.spec()));
-  std::string redirect_path;
-  ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements(
-      "prerender_redirect_to_https.html",
-      replacement_text,
-      &redirect_path));
-  PrerenderTestURL(redirect_path,
-                   FINAL_STATUS_HTTPS,
-                   2);
-}
-
 }  // namespace prerender