Revert "[Prerender] CancelPrerender tests move to NoStatePrefetchTests."

This reverts commit 1f6950fb.

Reason for revert: causing flake on Mac10.12 Tests, e.g. see
https://ci.chromium.org/p/chromium/builders/ci/Mac10.12%20Tests/35842

Original change's description:
> [Prerender] CancelPrerender tests move to NoStatePrefetchTests.
> 
> Move tests that verify logic around canceling prerenders to
> NoStatePrefetchTests.
> 
> Please see this spreadsheet for details:
> 
> https://docs.google.com/spreadsheets/d/1LFPB4UhPWQkBRz481lz49zmS25znhjSDUtagtTTSPQo/edit?usp=sharing
> 
> Bug: 898955
> Change-Id: I038bf08496483cd07545f26ae2937e34d2283e97
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2284991
> Reviewed-by: Ryan Sturm <ryansturm@chromium.org>
> Commit-Queue: Mugdha Lakhani <nator@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#786210}

TBR=ryansturm@chromium.org,nator@chromium.org

Change-Id: I2579084bc935ca97071d2b2990532ae43017ea4f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 898955
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2288355Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786382}

chrome/browser/prerender/prerender_browsertest.cc

@@ -1021,6 +1021,16 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
                                WindowOpenDisposition::CURRENT_TAB, false);
 }
 
+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelAll) {
+  std::unique_ptr<TestPrerender> prerender = PrerenderTestURL(
+      "/prerender/prerender_page.html", FINAL_STATUS_CANCELLED, 1);
+
+  GetPrerenderManager()->CancelAllPrerenders();
+  prerender->WaitForStop();
+
+  EXPECT_FALSE(prerender->contents());
+}
+
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderEvents) {
   std::unique_ptr<TestPrerender> prerender = PrerenderTestURL(
       "/prerender/prerender_page.html", FINAL_STATUS_CANCELLED, 1);
@@ -1033,6 +1043,19 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderEvents) {
   EXPECT_FALSE(HadPrerenderEventErrors());
 }
 
+// Cancels the prerender of a page with its own prerender.  The second prerender
+// should never be started.
+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
+                       PrerenderCancelPrerenderWithPrerender) {
+  std::unique_ptr<TestPrerender> prerender = PrerenderTestURL(
+      "/prerender/prerender_infinite_a.html", FINAL_STATUS_CANCELLED, 1);
+
+  GetPrerenderManager()->CancelAllPrerenders();
+  prerender->WaitForStop();
+
+  EXPECT_FALSE(prerender->contents());
+}
+
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewWindow) {
   PrerenderTestURL("/prerender/prerender_page_with_link.html",
                    FINAL_STATUS_APP_TERMINATING, 1);

chrome/browser/prerender/prerender_nostate_prefetch_browsertest.cc

@@ -1442,37 +1442,4 @@ IN_PROC_BROWSER_TEST_F(NoStatePrefetchBrowserTest, ClearCache) {
   EXPECT_EQ(1U, GetHistoryLength());
 }
 
-IN_PROC_BROWSER_TEST_F(NoStatePrefetchBrowserTest, CancelAll) {
-  GURL first_url = src_server()->GetURL("/prerender/prerender_page.html");
-  GURL first_loader_url = ServeLoaderURL(
-      kPrefetchLoaderPath, "REPLACE_WITH_PREFETCH_URL", first_url, "");
-  std::vector<FinalStatus> first_expected_status_queue(1,
-                                                       FINAL_STATUS_CANCELLED);
-  std::vector<std::unique_ptr<TestPrerender>> prerenders =
-      NavigateWithPrerenders(first_loader_url, first_expected_status_queue);
-
-  GetPrerenderManager()->CancelAllPrerenders();
-  prerenders[0]->WaitForStop();
-
-  EXPECT_FALSE(prerenders[0]->contents());
-}
-
-// Cancels the prerender of a page with its own prerender. The second prerender
-// should never be started.
-IN_PROC_BROWSER_TEST_F(NoStatePrefetchBrowserTest,
-                       CancelPrerenderWithPrerender) {
-  GURL first_url = src_server()->GetURL("/prerender/prerender_infinite_a.html");
-  GURL first_loader_url = ServeLoaderURL(
-      kPrefetchLoaderPath, "REPLACE_WITH_PREFETCH_URL", first_url, "");
-  std::vector<FinalStatus> first_expected_status_queue(1,
-                                                       FINAL_STATUS_CANCELLED);
-  std::vector<std::unique_ptr<TestPrerender>> prerenders =
-      NavigateWithPrerenders(first_loader_url, first_expected_status_queue);
-
-  GetPrerenderManager()->CancelAllPrerenders();
-  prerenders[0]->WaitForStop();
-
-  EXPECT_FALSE(prerenders[0]->contents());
-}
-
 }  // namespace prerender