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

content/browser/renderer_host/render_widget_helper.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
 #pragma once
 
 #include <deque>
 #include <map>
@@ skipping 110 matching lines @@
   // if not found. NOTE: The raw pointer is for temporary use only. To retain,
   // store in a scoped_refptr.
   static RenderWidgetHelper* FromProcessHostID(int render_process_host_id);
 
   // UI THREAD ONLY -----------------------------------------------------------
 
   // These three functions provide the backend implementation of the
   // corresponding functions in RenderProcessHost. See those declarations
   // for documentation.
   void CancelResourceRequests(int render_widget_id);
-  void SimulateSwapOutACK(const ViewMsg_SwapOut_Params& params);
+  void CrossSiteSwapOutACK(const ViewMsg_SwapOut_Params& params);
   bool WaitForBackingStoreMsg(int render_widget_id,
                               const base::TimeDelta& max_delay,
                               IPC::Message* msg);
 
 #if defined(OS_MACOSX)
   // Given the id of a transport DIB, return a mapping to it or NULL on error.
   TransportDIB* MapTransportDIB(TransportDIB::Id dib_id);
 #endif
 
   // IO THREAD ONLY -----------------------------------------------------------
@@ skipping 60 matching lines @@
   void OnCreateWidgetOnUI(int opener_id,
                           int route_id,
                           WebKit::WebPopupType popup_type);
 
   // Called on the UI thread to create a fullscreen widget.
   void OnCreateFullscreenWidgetOnUI(int opener_id, int route_id);
 
   // Called on the IO thread to cancel resource requests for the render widget.
   void OnCancelResourceRequests(int render_widget_id);
 
-  // Called on the IO thread to resume a cross-site response, if the ack is
-  // not received as expected.
-  void OnSimulateSwapOutACK(const ViewMsg_SwapOut_Params& params);
+  // Called on the IO thread to resume a cross-site response.
+  void OnCrossSiteSwapOutACK(const ViewMsg_SwapOut_Params& params);
 
 #if defined(OS_MACOSX)
   // Called on destruction to release all allocated transport DIBs
   void ClearAllocatedDIBs();
 
   // On OSX we keep file descriptors to all the allocated DIBs around until
   // the renderer frees them.
   base::Lock allocated_dibs_lock_;
   std::map<TransportDIB::Id, int> allocated_dibs_;
 #endif
@@ skipping 12 matching lines @@
 
   // The next routing id to use.
   base::AtomicSequenceNumber next_routing_id_;
 
   content::ResourceDispatcherHostImpl* resource_dispatcher_host_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHelper);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_