Revert "Revert 249676 "Have the unload event execute in background on cr...""

content/test/test_web_contents.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 "content/test/test_web_contents.h"
 
 #include <utility>
 
 #include "content/browser/browser_url_handler_impl.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
@@ skipping 133 matching lines @@
     rvh = static_cast<TestRenderViewHost*>(old_rvh);
 
   const NavigationEntry* entry = GetController().GetPendingEntry();
   DCHECK(entry);
   int page_id = entry->GetPageID();
   if (page_id == -1) {
     // It's a new navigation, assign a never-seen page id to it.
     page_id = GetMaxPageIDForSiteInstance(rvh->GetSiteInstance()) + 1;
   }
 
-  // Simulate the SwapOut_ACK that happens when we swap out the old
-  // RVH, before the navigation commits. This is needed when
-  // cross-site navigation happens (old_rvh != rvh).
+  rvh->SendNavigate(page_id, entry->GetURL());
+  // Simulate the SwapOut_ACK. This is needed when cross-site navigation happens
+  // (old_rvh != rvh).
   if (old_rvh != rvh)
     static_cast<RenderViewHostImpl*>(old_rvh)->OnSwappedOut(false);
-  rvh->SendNavigate(page_id, entry->GetURL());
 }
 
 void TestWebContents::ProceedWithCrossSiteNavigation() {
   if (!GetPendingRenderViewHost())
     return;
   TestRenderViewHost* rvh = static_cast<TestRenderViewHost*>(
       GetRenderViewHost());
   rvh->SendShouldCloseACK(true);
 }
 
@@ skipping 79 matching lines @@
 }
 
 void TestWebContents::ShowCreatedWidget(int route_id,
                                         const gfx::Rect& initial_pos) {
 }
 
 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) {
 }
 
 }  // namespace content