Have the unload event execute in background on cross-site navigations

chrome/test/base/browser_with_test_window_test.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 "chrome/test/base/browser_with_test_window_test.h"
 
 #include "base/run_loop.h"
 #include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
@@ skipping 115 matching lines @@
   if (pending_rvh) {
     // Simulate the ShouldClose_ACK that is received from the current renderer
     // for a cross-site navigation.
     DCHECK_NE(old_rvh, pending_rvh);
     RenderViewHostTester::For(old_rvh)->SendShouldCloseACK(true);
   }
   // Commit on the pending_rvh, if one exists.
   RenderViewHost* test_rvh = pending_rvh ? pending_rvh : old_rvh;
   RenderViewHostTester* test_rvh_tester = RenderViewHostTester::For(test_rvh);
 
-  // Simulate a SwapOut_ACK before the navigation commits.
-  if (pending_rvh)
-    RenderViewHostTester::For(old_rvh)->SimulateSwapOutACK();
 
   // For new navigations, we need to send a larger page ID. For renavigations,
   // we need to send the preexisting page ID. We can tell these apart because
   // renavigations will have a pending_entry_index while new ones won't (they'll
   // just have a standalong pending_entry that isn't in the list already).
   if (controller->GetPendingEntryIndex() >= 0) {
     test_rvh_tester->SendNavigateWithTransition(
         controller->GetPendingEntry()->GetPageID(),
         controller->GetPendingEntry()->GetURL(),
         controller->GetPendingEntry()->GetTransitionType());
   } else {
     test_rvh_tester->SendNavigateWithTransition(
         controller->GetWebContents()->
             GetMaxPageIDForSiteInstance(test_rvh->GetSiteInstance()) + 1,
         controller->GetPendingEntry()->GetURL(),
         controller->GetPendingEntry()->GetTransitionType());
   }
+  // Simulate the SwapOut_ACK from the renderer.

[nasko, 2014/01/23 23:34:58]

Why did this move? 

[clamy, 2014/01/24 17:01:54]

It was causing a problem with some tests in unit_tests (the RVH would not end up
in the right state and would not be deleted). However, it must have come from
another underlying issue that was fixed, since removing this change does not
seem to affect tests at all. I undid the move.

+  if (pending_rvh)
+    RenderViewHostTester::For(old_rvh)->SimulateSwapOutACK();
 }
 
 void BrowserWithTestWindowTest::NavigateAndCommit(
     NavigationController* controller,
     const GURL& url) {
   controller->LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
   CommitPendingLoad(controller);
 }
 
@@ skipping 49 matching lines @@
   Browser::CreateParams params(profile, host_desktop_type);
   params.window = browser_window;
   return new Browser(params);
 }
 
 #if defined(TOOLKIT_VIEWS)
 views::ViewsDelegate* BrowserWithTestWindowTest::CreateViewsDelegate() {
   return new views::TestViewsDelegate;
 }
 #endif