Revert of [NoStatePrefetch] Kill renderer after preload scanning

chrome/browser/prerender/prerender_browsertest.cc

Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 3116cfc60e8468d796e1753cbbac3f04cb94758c..11f9d761bdf6f969df4331365f313084cfcd2d8f 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -600,36 +600,6 @@
 
   ~PrerenderBrowserTest() override {}
 
-  std::unique_ptr<TestPrerender> PrerenderTestURL(
-      const std::string& html_file,
-      FinalStatus expected_final_status,
-      int expected_number_of_loads) {
-    GURL url = src_server()->GetURL(MakeAbsolute(html_file));
-    return PrerenderTestURL(url, expected_final_status,
-                            expected_number_of_loads);
-  }
-
-  std::unique_ptr<TestPrerender> PrerenderTestURL(
-      const GURL& url,
-      FinalStatus expected_final_status,
-      int expected_number_of_loads) {
-    std::vector<FinalStatus> expected_final_status_queue(1,
-                                                         expected_final_status);
-    auto prerenders = PrerenderTestURLImpl(url, expected_final_status_queue,
-                                           expected_number_of_loads);
-    CHECK_EQ(1u, prerenders.size());
-    return std::move(prerenders[0]);
-  }
-
-  std::vector<std::unique_ptr<TestPrerender>> PrerenderTestURL(
-      const std::string& html_file,
-      const std::vector<FinalStatus>& expected_final_status_queue,
-      int expected_number_of_loads) {
-    GURL url = src_server()->GetURL(MakeAbsolute(html_file));
-    return PrerenderTestURLImpl(url, expected_final_status_queue,
-                                expected_number_of_loads);
-  }
-
   void SetUpCommandLine(base::CommandLine* command_line) override {
     PrerenderInProcessBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(switches::kPrerenderMode,
@@ -940,19 +910,27 @@
   std::vector<std::unique_ptr<TestPrerender>> PrerenderTestURLImpl(
       const GURL& prerender_url,
       const std::vector<FinalStatus>& expected_final_status_queue,
-      int expected_number_of_loads) {
+      int expected_number_of_loads) override {
     dest_url_ = prerender_url;
 
-    GURL loader_url = ServeLoaderURL(loader_path_, "REPLACE_WITH_PRERENDER_URL",
-                                     prerender_url, "&" + loader_query_);
+    base::StringPairs replacement_text;
+    replacement_text.push_back(
+        make_pair("REPLACE_WITH_PRERENDER_URL", prerender_url.spec()));
+    std::string replacement_path;
+    net::test_server::GetFilePathWithReplacements(
+        loader_path_, replacement_text, &replacement_path);
+
+    GURL loader_url =
+        src_server()->GetURL(replacement_path + "&" + loader_query_);
+
     GURL::Replacements loader_replacements;
     if (!loader_host_override_.empty())
       loader_replacements.SetHostStr(loader_host_override_);
     loader_url = loader_url.ReplaceComponents(loader_replacements);
 
     std::vector<std::unique_ptr<TestPrerender>> prerenders =
-        NavigateWithPrerenders(loader_url, expected_final_status_queue);
-    prerenders[0]->WaitForLoads(expected_number_of_loads);
+        NavigateWithPrerenders(loader_url, expected_final_status_queue,
+                               expected_number_of_loads);
 
     FinalStatus expected_final_status = expected_final_status_queue.front();
     if (ShouldAbortPrerenderBeforeSwap(expected_final_status)) {