Fixing a problem, where a hung renderer process is not killed when navigating away

content/browser/web_contents/render_view_host_manager_unittest.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 "base/utf_string_conversions.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/mock_content_browser_client.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/navigation_entry_impl.h"
@@ skipping 154 matching lines @@
       old_rvh->SendShouldCloseACK(true);
 
     // Commit the navigation with a new page ID.
     int32 max_page_id = contents()->GetMaxPageIDForSiteInstance(
         active_rvh()->GetSiteInstance());
     active_test_rvh()->SendNavigate(max_page_id + 1, url);
 
     // Simulate the SwapOut_ACK that fires if you commit a cross-site navigation
     // without making any network requests.
     if (old_rvh != active_rvh())
-      old_rvh->OnSwapOutACK();
+      old_rvh->OnSwapOutACK(false);
   }
 
   bool ShouldSwapProcesses(RenderViewHostManager* manager,
                            const NavigationEntryImpl* cur_entry,
                            const NavigationEntryImpl* new_entry) const {
     return manager->ShouldSwapProcessesForNavigation(cur_entry, new_entry);
   }
 
  private:
   RenderViewHostManagerTestClient client_;
@@ skipping 33 matching lines @@
   // requiring a beforeunload ack.
   contents2.GetController().LoadURL(
       kDestUrl, content::Referrer(), content::PAGE_TRANSITION_LINK,
       std::string());
   EXPECT_TRUE(contents2.cross_navigation_pending());
   TestRenderViewHost* dest_rvh2 = static_cast<TestRenderViewHost*>(
       contents2.GetRenderManagerForTesting()->pending_render_view_host());
   ASSERT_TRUE(dest_rvh2);
   ntp_rvh2->SendShouldCloseACK(true);
   dest_rvh2->SendNavigate(101, kDestUrl);
-  ntp_rvh2->OnSwapOutACK();
+  ntp_rvh2->OnSwapOutACK(false);
 
   // The two RVH's should be different in every way.
   EXPECT_NE(active_rvh()->GetProcess(), dest_rvh2->GetProcess());
   EXPECT_NE(active_rvh()->GetSiteInstance(), dest_rvh2->GetSiteInstance());
   EXPECT_NE(static_cast<SiteInstanceImpl*>(active_rvh()->GetSiteInstance())->
                 browsing_instance_,
             static_cast<SiteInstanceImpl*>(dest_rvh2->GetSiteInstance())->
                 browsing_instance_);
 
   // Navigate both to the new tab page, and verify that they share a
   // SiteInstance.
   NavigateActiveAndCommit(kNtpUrl);
 
   contents2.GetController().LoadURL(
       kNtpUrl, content::Referrer(), content::PAGE_TRANSITION_LINK,
       std::string());
   dest_rvh2->SendShouldCloseACK(true);
   static_cast<TestRenderViewHost*>(contents2.GetRenderManagerForTesting()->
      pending_render_view_host())->SendNavigate(102, kNtpUrl);
-  dest_rvh2->OnSwapOutACK();
+  dest_rvh2->OnSwapOutACK(false);
 
   EXPECT_EQ(active_rvh()->GetSiteInstance(),
       contents2.GetRenderViewHost()->GetSiteInstance());
 }
 
 // Ensure that the browser ignores most IPC messages that arrive from a
 // RenderViewHost that has been swapped out.  We do not want to take
 // action on requests from a non-active renderer.  The main exception is
 // for synchronous messages, which cannot be ignored without leaving the
 // renderer in a stuck state.  See http://crbug.com/93427.
@@ skipping 316 matching lines @@
   test_host->SendShouldCloseACK(true);
 
   // CrossSiteResourceHandler::StartCrossSiteTransition triggers a
   // call of RenderViewHostManager::OnCrossSiteResponse before
   // RenderViewHostManager::DidNavigateMainFrame is called.
   // The RVH is not swapped out until the commit.
   manager.OnCrossSiteResponse(host2->GetProcess()->GetID(),
                               host2->GetPendingRequestId());
   EXPECT_TRUE(test_process_host->sink().GetUniqueMessageMatching(
       ViewMsg_SwapOut::ID));
-  test_host->OnSwapOutACK();
+  test_host->OnSwapOutACK(false);
 
   EXPECT_EQ(host, manager.current_host());
   EXPECT_FALSE(static_cast<RenderViewHostImpl*>(
       manager.current_host())->is_swapped_out());
   EXPECT_EQ(host2, manager.pending_render_view_host());
   // There should be still no navigation messages being sent.
   EXPECT_FALSE(test_process_host2->sink().GetUniqueMessageMatching(
       ViewMsg_Navigate::ID));
 
   // 3) Cross-site navigate to next site before 2) has committed. --------------
@@ skipping 27 matching lines @@
 
   // CrossSiteResourceHandler::StartCrossSiteTransition triggers a
   // call of RenderViewHostManager::OnCrossSiteResponse before
   // RenderViewHostManager::DidNavigateMainFrame is called.
   // The RVH is not swapped out until the commit.
   manager.OnCrossSiteResponse(host3->GetProcess()->GetID(),
                               static_cast<RenderViewHostImpl*>(
                                   host3)->GetPendingRequestId());
   EXPECT_TRUE(test_process_host->sink().GetUniqueMessageMatching(
       ViewMsg_SwapOut::ID));
-  test_host->OnSwapOutACK();
+  test_host->OnSwapOutACK(false);
 
   // Commit.
   manager.DidNavigateMainFrame(host3);
   EXPECT_TRUE(host3 == manager.current_host());
   ASSERT_TRUE(host3);
   EXPECT_TRUE(static_cast<SiteInstanceImpl*>(host3->GetSiteInstance())->
       HasSite());
   // Check the pending RenderViewHost has been committed.
   EXPECT_FALSE(manager.pending_render_view_host());
 
@@ skipping 118 matching lines @@
 
   // We should be able to navigate forward.
   contents()->GetController().GoForward();
   contents()->ProceedWithCrossSiteNavigation();
   const NavigationEntry* entry2 = contents()->GetController().GetPendingEntry();
   rvh2->SendNavigate(entry2->GetPageID(), entry2->GetURL());
   EXPECT_EQ(rvh2, rvh());
   EXPECT_FALSE(rvh2->is_swapped_out());
   EXPECT_TRUE(rvh1->is_swapped_out());
 }