Remove PrerenderManager::OnCloseWebContentsDeleter::SwappedOut

chrome/browser/prerender/prerender_browsertest.cc

 // Copyright (c) 2012 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 <stddef.h>
 #include <deque>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 308 matching lines @@
     channel_destroyed_ = true;
     run_loop_.Quit();
   }
 
   bool channel_destroyed_;
   base::RunLoop run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelDestructionWatcher);
 };
 
+// A navigation observer to wait until WebContents is destroyed.
+class WebContentsDestructionObserver : public WebContentsObserver {
+ public:
+  explicit WebContentsDestructionObserver(WebContents* web_contents)
+      : WebContentsObserver(web_contents) {}
+
+  // Waits for destruction of the observed WebContents.
+  void Wait() {
+    loop_.Run();
+  }
+
+  // WebContentsObserver implementation:
+  void WebContentsDestroyed() override {
+    loop_.Quit();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(WebContentsDestructionObserver);
+  base::RunLoop loop_;
+};
+
 // A navigation observer to wait on either a new load or a swap of a
 // WebContents. On swap, if the new WebContents is still loading, wait for that
 // load to complete as well. Note that the load must begin after the observer is
 // attached.
 class NavigationOrSwapObserver : public WebContentsObserver,
                                  public TabStripModelObserver {
  public:
   // Waits for either a new load or a swap of |tab_strip_model|'s active
   // WebContents.
   NavigationOrSwapObserver(TabStripModel* tab_strip_model,
@@ skipping 2728 matching lines @@
       favicon::ContentFaviconDriver::FromWebContents(GetActiveWebContents());
   if (!favicon_driver->FaviconIsValid()) {
     // If the favicon has not been set yet, wait for it to be.
     FaviconUpdateWatcher favicon_update_watcher(GetActiveWebContents());
     favicon_update_watcher.Wait();
   }
   EXPECT_TRUE(favicon_driver->FaviconIsValid());
 }
 
 // Checks that when a prerendered page is swapped in to a referring page, the
-// unload handlers on the referring page are executed.
+// unload handlers on the referring page are executed and its WebContents is
+// destroyed.
+// TODO(pasko): A similar test for BeforeUnload. See http://crbug.com/600693
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderUnload) {
   // Matches URL in prerender_loader_with_unload.html.
   const GURL unload_url("http://unload-url.test");
   base::FilePath empty_file = ui_test_utils::GetTestFilePath(
       base::FilePath(), base::FilePath(FILE_PATH_LITERAL("empty.html")));
   RequestCounter unload_counter;
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&CreateCountingInterceptorOnIO,
                  unload_url, empty_file, unload_counter.AsWeakPtr()));
 
   set_loader_path("/prerender/prerender_loader_with_unload.html");
   PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
+  WebContentsDestructionObserver destruction_observer(GetActiveWebContents());
   NavigateToDestURL();
   unload_counter.WaitForCount(1);
+  destruction_observer.Wait();
 }
 
 // Checks that a hanging unload on the referring page of a prerender swap does
 // not crash the browser on exit.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHangingUnload) {
   // Matches URL in prerender_loader_with_unload.html.
   const GURL hang_url("http://unload-url.test");
   base::FilePath empty_file = ui_test_utils::GetTestFilePath(
       base::FilePath(), base::FilePath(FILE_PATH_LITERAL("empty.html")));
   BrowserThread::PostTask(
@@ skipping 958 matching lines @@
 
   NavigateToDestURL();
   EXPECT_EQ(1U, task_manager.tasks().size());
 }
 
 }  // namespace
 
 #endif  // defined(ENABLE_TASK_MANAGER)
 
 }  // namespace prerender