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

content/browser/web_contents/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/browser/web_contents/test_web_contents.h"
 
 #include <utility>
 
 #include "content/browser/browser_url_handler_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ skipping 120 matching lines @@
   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;
   }
   rvh->SendNavigate(page_id, entry->GetURL());
 
   // Simulate the SwapOut_ACK that fires if you commit a cross-site navigation
   // without making any network requests.
   if (old_rvh != rvh)
-    static_cast<RenderViewHostImpl*>(old_rvh)->OnSwapOutACK(false);
+    static_cast<RenderViewHostImpl*>(old_rvh)->OnSwapOutACK();
 }
 
 int TestWebContents::GetNumberOfFocusCalls() {
   NOTREACHED();
   return 0;
 }
 
 void TestWebContents::ProceedWithCrossSiteNavigation() {
   if (!GetPendingRenderViewHost())
     return;
@@ skipping 32 matching lines @@
     int32 min_page_id) {
   EXPECT_TRUE(expect_set_history_length_and_prune_);
   expect_set_history_length_and_prune_ = false;
   EXPECT_EQ(expect_set_history_length_and_prune_site_instance_, site_instance);
   EXPECT_EQ(expect_set_history_length_and_prune_history_length_,
             history_length);
   EXPECT_EQ(expect_set_history_length_and_prune_min_page_id_, min_page_id);
 }
 
 }  // namespace content