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

content/browser/renderer_host/render_widget_helper.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/renderer_host/render_widget_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/eintr_wrapper.h"
 #include "base/lazy_instance.h"
@@ skipping 117 matching lines @@
   if (render_process_id_ == -1)
     return;
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&RenderWidgetHelper::OnCancelResourceRequests,
                  this,
                  render_widget_id));
 }
 
-void RenderWidgetHelper::SimulateSwapOutACK(
+void RenderWidgetHelper::CrossSiteSwapOutACK(
     const ViewMsg_SwapOut_Params& params) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      base::Bind(&RenderWidgetHelper::OnSimulateSwapOutACK,
+      base::Bind(&RenderWidgetHelper::OnCrossSiteSwapOutACK,
                  this,
                  params));
 }
 
 bool RenderWidgetHelper::WaitForBackingStoreMsg(
     int render_widget_id,
                                           const base::TimeDelta& max_delay,
                                           IPC::Message* msg) {
   base::TimeTicks time_start = base::TimeTicks::Now();
 
@@ skipping 86 matching lines @@
   if (host)
     host->OnMessageReceived(proxy->message());
 }
 
 void RenderWidgetHelper::OnCancelResourceRequests(
     int render_widget_id) {
   resource_dispatcher_host_->CancelRequestsForRoute(
       render_process_id_, render_widget_id);
 }
 
-void RenderWidgetHelper::OnSimulateSwapOutACK(
+void RenderWidgetHelper::OnCrossSiteSwapOutACK(
     const ViewMsg_SwapOut_Params& params) {
-  resource_dispatcher_host_->OnSimulateSwapOutACK(params);
+  resource_dispatcher_host_->OnSwapOutACK(params);
 }
 
 void RenderWidgetHelper::CreateNewWindow(
     const ViewHostMsg_CreateWindow_Params& params,
     bool no_javascript_access,
     base::ProcessHandle render_process,
     int* route_id,
     int* surface_id) {
   if (params.opener_suppressed || no_javascript_access) {
     // If the opener is supppressed or script access is disallowed, we should
@@ skipping 133 matching lines @@
 void RenderWidgetHelper::ClearAllocatedDIBs() {
   for (std::map<TransportDIB::Id, int>::iterator
        i = allocated_dibs_.begin(); i != allocated_dibs_.end(); ++i) {
     if (HANDLE_EINTR(close(i->second)) < 0)
       PLOG(ERROR) << "close: " << i->first;
   }
 
   allocated_dibs_.clear();
 }
 #endif