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

Reverting along with 132852 due to suspected impact on stability numbers.

BUG=104346
TEST=Steps to reproduce listed in the bug.


Review URL: http://codereview.chromium.org/10065028

TBR=nasko@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10356103

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136328 0039d316-1c4b-4281-b951-d872f2087c98

22 files changed, 35 insertions, 343 deletions

diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index ef08140..a93fa1d 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -555,9 +555,9 @@ void RenderProcessHostImpl::CancelResourceRequests(int render_widget_id) {
   widget_helper_->CancelResourceRequests(render_widget_id);
 }
 
-void RenderProcessHostImpl::SimulateSwapOutACK(
+void RenderProcessHostImpl::CrossSiteSwapOutACK(
     const ViewMsg_SwapOut_Params& params) {
-  widget_helper_->SimulateSwapOutACK(params);
+  widget_helper_->CrossSiteSwapOutACK(params);
 }
 
 bool RenderProcessHostImpl::WaitForBackingStoreMsg(
diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h
index e559a5c..549e154 100644
--- a/content/browser/renderer_host/render_process_host_impl.h
+++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -61,8 +61,8 @@ class CONTENT_EXPORT RenderProcessHostImpl
   virtual bool Init() OVERRIDE;
   virtual int GetNextRoutingID() OVERRIDE;
   virtual void CancelResourceRequests(int render_widget_id) OVERRIDE;
-  virtual void SimulateSwapOutACK(
-      const ViewMsg_SwapOut_Params& params) OVERRIDE;
+  virtual void CrossSiteSwapOutACK(const ViewMsg_SwapOut_Params& params)
+      OVERRIDE;
   virtual bool WaitForBackingStoreMsg(int render_widget_id,
                                       const base::TimeDelta& max_delay,
                                       IPC::Message* msg) OVERRIDE;
diff --git a/content/browser/renderer_host/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc
index effdbb8..71846f9 100644
--- a/content/browser/renderer_host/render_view_host_browsertest.cc
+++ b/content/browser/renderer_host/render_view_host_browsertest.cc
@@ -11,7 +11,6 @@
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
-#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "net/base/host_port_pair.h"
@@ -229,143 +228,3 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BaseURLParam) {
   ui_test_utils::NavigateToURL(browser(), test_url);
   EXPECT_EQ("http://www.google.com/", observer.base_url().spec());
 }
-
-// Test that a hung renderer is killed after navigating away during cross-site
-// navigation.
-IN_PROC_BROWSER_TEST_F(RenderViewHostTest, UnresponsiveCrossSiteNavigation) {
-  WebContents* web_contents = NULL;
-  WebContents* web_contents_2 = NULL;
-  content::RenderProcessHost* rph = NULL;
-  base::ProcessHandle process;
-  FilePath doc_root;
-
-  doc_root = doc_root.Append(FILE_PATH_LITERAL("content"));
-  doc_root = doc_root.Append(FILE_PATH_LITERAL("test"));
-  doc_root = doc_root.Append(FILE_PATH_LITERAL("data"));
-
-  // Start two servers to enable cross-site navigations.
-  net::TestServer server(net::TestServer::TYPE_HTTP,
-      net::TestServer::kLocalhost, doc_root);
-  ASSERT_TRUE(server.Start());
-  net::TestServer https_server(net::TestServer::TYPE_HTTPS,
-      net::TestServer::kLocalhost, doc_root);
-  ASSERT_TRUE(https_server.Start());
-
-  GURL infinite_beforeunload_url(
-      server.GetURL("files/infinite_beforeunload.html"));
-  GURL infinite_unload_url(server.GetURL("files/infinite_unload.html"));
-  GURL same_process_url(server.GetURL("files/english_page.html"));
-  GURL new_process_url(https_server.GetURL("files/english_page.html"));
-
-  // Navigate the tab to the page which will lock up the process when we
-  // navigate away from it.
-  ui_test_utils::NavigateToURL(browser(), infinite_beforeunload_url);
-  web_contents = browser()->GetWebContentsAt(0);
-  rph = web_contents->GetRenderProcessHost();
-  EXPECT_EQ(web_contents->GetURL(), infinite_beforeunload_url);
-
-  // Remember the process prior to navigation, as we expect it to get killed.
-  process = rph->GetHandle();
-  ASSERT_TRUE(process);
-
-  {
-    ui_test_utils::WindowedNotificationObserver process_exit_observer(
-        content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
-        content::NotificationService::AllSources());
-    ui_test_utils::WindowedNotificationObserver process_hang_observer(
-        content::NOTIFICATION_RENDERER_PROCESS_HANG,
-        content::NotificationService::AllSources());
-    ui_test_utils::NavigateToURL(browser(), new_process_url);
-    process_hang_observer.Wait();
-    process_exit_observer.Wait();
-
-    // Since the process is killed during the navigation, we don't expect the
-    // renderer host to have a connection to it.
-    EXPECT_FALSE(rph->HasConnection());
-  }
-
-  ui_test_utils::NavigateToURL(browser(), same_process_url);
-  web_contents = browser()->GetWebContentsAt(0);
-  rph = web_contents->GetRenderProcessHost();
-  ASSERT_TRUE(web_contents != NULL);
-  EXPECT_EQ(web_contents->GetURL(), same_process_url);
-
-  // Now, let's open another tab with the unresponsive page, which will cause
-  // the previous page and the unresponsive one to use the same process.
-  ui_test_utils::NavigateToURLWithDisposition(browser(),
-      infinite_unload_url, NEW_FOREGROUND_TAB,
-      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  EXPECT_EQ(browser()->tab_count(), 2);
-  web_contents_2 = browser()->GetWebContentsAt(1);
-  ASSERT_TRUE(web_contents_2 != NULL);
-  EXPECT_EQ(web_contents_2->GetURL(), infinite_unload_url);
-  EXPECT_EQ(rph, web_contents_2->GetRenderProcessHost());
-
-  process = rph->GetHandle();
-  ASSERT_TRUE(process);
-
-  // Navigating to the cross site URL will not kill the process, since it will
-  // have more than one tab using it. Kill it to confirm that it is still there,
-  // as well as finish the test faster.
-  {
-    ui_test_utils::WindowedNotificationObserver process_exit_observer(
-        content::NOTIFICATION_RENDERER_PROCESS_HANG,
-        content::NotificationService::AllSources());
-    ui_test_utils::NavigateToURL(browser(), new_process_url);
-    process_exit_observer.Wait();
-  }
-
-  EXPECT_TRUE(base::KillProcess(process, 2, false));
-}
-
-// Test that a hung renderer is killed when we are closing the page.
-IN_PROC_BROWSER_TEST_F(RenderViewHostTest, UnresponsiveClosePage) {
-  WebContents* web_contents = NULL;
-  FilePath doc_root;
-
-  doc_root = doc_root.Append(FILE_PATH_LITERAL("content"));
-  doc_root = doc_root.Append(FILE_PATH_LITERAL("test"));
-  doc_root = doc_root.Append(FILE_PATH_LITERAL("data"));
-
-  net::TestServer server(net::TestServer::TYPE_HTTP,
-      net::TestServer::kLocalhost, doc_root);
-  ASSERT_TRUE(server.Start());
-  net::TestServer https_server(net::TestServer::TYPE_HTTPS,
-      net::TestServer::kLocalhost, doc_root);
-  ASSERT_TRUE(https_server.Start());
-
-  GURL infinite_beforeunload_url(
-      server.GetURL("files/infinite_beforeunload.html"));
-  GURL infinite_unload_url(server.GetURL("files/infinite_unload.html"));
-  GURL new_process_url(https_server.GetURL("files/english_page.html"));
-
-  ui_test_utils::NavigateToURL(browser(), new_process_url);
-
-  // Navigate a tab to a page which will spin into an infinite loop in the
-  // beforeunload handler, tying up the process when we close the tab.
-  ui_test_utils::NavigateToURLWithDisposition(browser(),
-      infinite_beforeunload_url, NEW_FOREGROUND_TAB,
-      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  web_contents = browser()->GetWebContentsAt(1);
-  {
-    ui_test_utils::WindowedNotificationObserver process_exit_observer(
-        content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
-        content::NotificationService::AllSources());
-    browser()->CloseTabContents(web_contents);
-    process_exit_observer.Wait();
-  }
-
-  // Navigate a tab to a page which will spin into an infinite loop in the
-  // unload handler, tying up the process when we close the tab.
-  ui_test_utils::NavigateToURLWithDisposition(browser(),
-      infinite_unload_url, NEW_FOREGROUND_TAB,
-      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  web_contents = browser()->GetWebContentsAt(1);
-  {
-    ui_test_utils::WindowedNotificationObserver process_exit_observer(
-        content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
-        content::NotificationService::AllSources());
-    browser()->CloseTabContents(web_contents);
-    process_exit_observer.Wait();
-  }
-}
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 62ef275..10095439 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -13,7 +13,6 @@
 #include "base/i18n/rtl.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
-#include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ -150,7 +149,6 @@ RenderViewHostImpl::RenderViewHostImpl(SiteInstance* instance,
       run_modal_opener_id_(MSG_ROUTING_NONE),
       is_waiting_for_beforeunload_ack_(false),
       is_waiting_for_unload_ack_(false),
-      has_timed_out_on_unload_(false),
       unload_ack_is_for_cross_site_transition_(false),
       are_javascript_messages_suppressed_(false),
       sudden_termination_allowed_(false),
@@ -408,9 +406,6 @@ void RenderViewHostImpl::FirePageBeforeUnload(bool for_cross_site_transition) {
     // handler.
     is_waiting_for_beforeunload_ack_ = true;
     unload_ack_is_for_cross_site_transition_ = for_cross_site_transition;
-    // Increment the in-flight event count, to ensure that input events won't
-    // cancel the timeout timer.
-    increment_in_flight_event_count();
     StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
     send_should_close_start_time_ = base::TimeTicks::Now();
     Send(new ViewMsg_ShouldClose(GetRoutingID()));
@@ -423,9 +418,6 @@ void RenderViewHostImpl::SwapOut(int new_render_process_host_id,
   // this RVH with the pending RVH.
   is_waiting_for_unload_ack_ = true;
   // Start the hang monitor in case the renderer hangs in the unload handler.
-  // Increment the in-flight event count, to ensure that input events won't
-  // cancel the timeout timer.
-  increment_in_flight_event_count();
   StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
 
   ViewMsg_SwapOut_Params params;
@@ -439,16 +431,14 @@ void RenderViewHostImpl::SwapOut(int new_render_process_host_id,
     // This RenderViewHost doesn't have a live renderer, so just skip the unload
     // event.  We must notify the ResourceDispatcherHost on the IO thread,
     // which we will do through the RenderProcessHost's widget helper.
-    GetProcess()->SimulateSwapOutACK(params);
+    GetProcess()->CrossSiteSwapOutACK(params);
   }
 }
 
-void RenderViewHostImpl::OnSwapOutACK(bool timed_out) {
+void RenderViewHostImpl::OnSwapOutACK() {
   // Stop the hang monitor now that the unload handler has finished.
-  decrement_in_flight_event_count();
   StopHangMonitorTimeout();
   is_waiting_for_unload_ack_ = false;
-  has_timed_out_on_unload_ = timed_out;
   delegate_->SwappedOut(this);
 }
 
@@ -456,12 +446,6 @@ void RenderViewHostImpl::WasSwappedOut() {
   // Don't bother reporting hung state anymore.
   StopHangMonitorTimeout();
 
-  // If we have timed out on running the unload handler, we consider
-  // the process hung and we should terminate it if there are no other tabs
-  // using the process. If there are other views using this process, the
-  // unresponsive renderer timeout will catch it.
-  bool hung = has_timed_out_on_unload_;
-
   // Now that we're no longer the active RVH in the tab, start filtering out
   // most IPC messages.  Usually the renderer will have stopped sending
   // messages as of OnSwapOutACK.  However, we may have timed out waiting
@@ -470,46 +454,6 @@ void RenderViewHostImpl::WasSwappedOut() {
   // still allow synchronous messages through).
   SetSwappedOut(true);
 
-  // If we are not running the renderer in process and no other tab is using
-  // the hung process, kill it, assuming it is a real process (unit tests don't
-  // have real processes).
-  if (hung) {
-    base::ProcessHandle process_handle = GetProcess()->GetHandle();
-    int views = 0;
-
-    // Count the number of widget hosts for the process, which is equivalent to
-    // views using the process as of this writing.
-    content::RenderProcessHost::RenderWidgetHostsIterator iter(
-        GetProcess()->GetRenderWidgetHostsIterator());
-    for (; !iter.IsAtEnd(); iter.Advance())
-      ++views;
-
-    if (!content::RenderProcessHost::run_renderer_in_process() &&
-        process_handle && views <= 1) {
-      // We expect the delegate for this RVH to be WebContents, as it is the
-      // only class that swaps out render view hosts on navigation.
-      DCHECK_EQ(delegate_->GetRenderViewType(),
-                content::VIEW_TYPE_WEB_CONTENTS);
-
-      // Kill the process only if WebContents sets SuddenTerminationAllowed,
-      // which indicates that the timer has expired.
-      // This is not the case if we load data URLs or about:blank. The reason
-      // is that there is no network requests and this code is hit without
-      // setting the unresponsiveness timer. This allows a corner case where a
-      // navigation to a data URL will leave a process running, if the
-      // beforeunload handler completes fine, but the unload handler hangs.
-      // At this time, the complexity to solve this edge case is not worthwhile.
-      if (SuddenTerminationAllowed()) {
-        base::KillProcess(process_handle, content::RESULT_CODE_HUNG, false);
-        // Log a histogram point to help us diagnose how many of those kills
-        // we have performed. 1 is the enum value for RendererType Normal for
-        // the histogram.
-        UMA_HISTOGRAM_PERCENTAGE(
-            "BrowserRenderProcessHost.ChildKillsUnresponsive", 1);
-      }
-    }
-  }
-
   // Inform the renderer that it can exit if no one else is using it.
   Send(new ViewMsg_WasSwappedOut(GetRoutingID()));
 }
@@ -520,11 +464,6 @@ void RenderViewHostImpl::ClosePage() {
   StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
 
   if (IsRenderViewLive()) {
-    // Since we are sending an IPC message to the renderer, increase the event
-    // count to prevent the hang monitor timeout from being stopped by input
-    // event acknowledgements.
-    increment_in_flight_event_count();
-
     // TODO(creis): Should this be moved to Shutdown?  It may not be called for
     // RenderViewHosts that have been swapped out.
     content::NotificationService::current()->Notify(
@@ -713,14 +652,8 @@ void RenderViewHostImpl::JavaScriptDialogClosed(IPC::Message* reply_msg,
   GetProcess()->SetIgnoreInputEvents(false);
   bool is_waiting =
       is_waiting_for_beforeunload_ack_ || is_waiting_for_unload_ack_;
-
-  // If we are executing as part of (before)unload event handling, we don't
-  // want to use the regular hung_renderer_delay_ms_ if the user has agreed to
-  // leave the current page. In this case, use the regular timeout value used
-  // during the (before)unload handling.
   if (is_waiting)
-    StartHangMonitorTimeout(TimeDelta::FromMilliseconds(
-        success ? kUnloadTimeoutMS : hung_renderer_delay_ms_));
+    StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
 
   ViewHostMsg_RunJavaScriptMessage::WriteReplyParams(reply_msg,
                                                      success, user_input);
@@ -1476,7 +1409,6 @@ void RenderViewHostImpl::OnMsgShouldCloseACK(
     bool proceed,
     const base::TimeTicks& renderer_before_unload_start_time,
     const base::TimeTicks& renderer_before_unload_end_time) {
-  decrement_in_flight_event_count();
   StopHangMonitorTimeout();
   // If this renderer navigated while the beforeunload request was in flight, we
   // may have cleared this state in OnMsgNavigate, in which case we can ignore
@@ -1518,7 +1450,6 @@ void RenderViewHostImpl::OnMsgShouldCloseACK(
 }
 
 void RenderViewHostImpl::OnMsgClosePageACK() {
-  decrement_in_flight_event_count();
   ClosePageIgnoringUnloadEvents();
 }
 
@@ -1890,7 +1821,6 @@ void RenderViewHostImpl::SetSwappedOut(bool is_swapped_out) {
   // can cause navigations to be ignored in OnMsgNavigate.
   is_waiting_for_beforeunload_ack_ = false;
   is_waiting_for_unload_ack_ = false;
-  has_timed_out_on_unload_ = false;
 }
 
 void RenderViewHostImpl::ClearPowerSaveBlockers() {
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index 8667787..91a7cc9 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -292,9 +292,8 @@ class CONTENT_EXPORT RenderViewHostImpl
   // of the parameters.
   void SwapOut(int new_render_process_host_id, int new_request_id);
 
-  // Called by ResourceDispatcherHost after the SwapOutACK is received or the
-  // response times out.
-  void OnSwapOutACK(bool timed_out);
+  // Called by ResourceDispatcherHost after the SwapOutACK is received.
+  void OnSwapOutACK();
 
   // Called to notify the renderer that it has been visibly swapped out and
   // replaced by another RenderViewHost, after an earlier call to SwapOut.
@@ -603,9 +602,6 @@ class CONTENT_EXPORT RenderViewHostImpl
   // is_waiting_for_beforeunload_ack_, unload_ack_is_for_cross_site_transition_.
   bool is_waiting_for_unload_ack_;
 
-  // Set to true when waiting for ViewHostMsg_SwapOut_ACK has timed out.
-  bool has_timed_out_on_unload_;
-
   // Valid only when is_waiting_for_beforeunload_ack_ or
   // is_waiting_for_unload_ack_ is true.  This tells us if the unload request
   // is for closing the entire tab ( = false), or only this RenderViewHost in
diff --git a/content/browser/renderer_host/render_widget_helper.cc b/content/browser/renderer_host/render_widget_helper.cc
index e516e6c..070b1d4 100644
--- a/content/browser/renderer_host/render_widget_helper.cc
+++ b/content/browser/renderer_host/render_widget_helper.cc
@@ -135,11 +135,11 @@ void RenderWidgetHelper::CancelResourceRequests(int render_widget_id) {
                  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));
 }
@@ -246,9 +246,9 @@ void RenderWidgetHelper::OnCancelResourceRequests(
       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(
diff --git a/content/browser/renderer_host/render_widget_helper.h b/content/browser/renderer_host/render_widget_helper.h
index b066979..de95600 100644
--- a/content/browser/renderer_host/render_widget_helper.h
+++ b/content/browser/renderer_host/render_widget_helper.h
@@ -128,7 +128,7 @@ class RenderWidgetHelper
   // 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);
@@ -209,9 +209,8 @@ class RenderWidgetHelper
   // 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
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 03be355..c9f6bdc 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -684,13 +684,9 @@ void RenderWidgetHostImpl::StartHangMonitorTimeout(TimeDelta delay) {
     return;
   }
 
-  // Set time_when_considered_hung_ if it's null. Otherwise, update
-  // time_when_considered_hung_ if the caller's request is sooner than the
-  // existing one. This will have the side effect that the existing timeout will
-  // be forgotten.
+  // Set time_when_considered_hung_ if it's null.
   Time requested_end_time = Time::Now() + delay;
-  if (time_when_considered_hung_.is_null() ||
-      time_when_considered_hung_ > requested_end_time)
+  if (time_when_considered_hung_.is_null())
     time_when_considered_hung_ = requested_end_time;
 
   // If we already have a timer with the same or shorter duration, then we can
@@ -909,7 +905,7 @@ void RenderWidgetHostImpl::ForwardInputEvent(const WebInputEvent& input_event,
   // after this line.
   next_mouse_move_.reset();
 
-  increment_in_flight_event_count();
+  in_flight_event_count_++;
   StartHangMonitorTimeout(
       TimeDelta::FromMilliseconds(hung_renderer_delay_ms_));
 }
@@ -1375,7 +1371,7 @@ void RenderWidgetHostImpl::OnMsgInputEventAck(WebInputEvent::Type event_type,
   UMA_HISTOGRAM_TIMES("MPArch.RWH_InputEventDelta", delta);
 
   // Cancel pending hung renderer checks since the renderer is responsive.
-  if (decrement_in_flight_event_count() == 0)
+  if (--in_flight_event_count_ == 0)
     StopHangMonitorTimeout();
 
   int type = static_cast<int>(event_type);
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
index 5a2ee7e..222ac68 100644
--- a/content/browser/renderer_host/render_widget_host_impl.h
+++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -429,11 +429,6 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost,
   void SetShouldAutoResize(bool enable);
 
  protected:
-  // Expose increment/decrement of the in-flight event count, so
-  // RenderViewHostImpl can account for in-flight beforeunload/unload events.
-  int increment_in_flight_event_count() { return ++in_flight_event_count_; }
-  int decrement_in_flight_event_count() { return --in_flight_event_count_; }
-
   // The View associated with the RenderViewHost. The lifetime of this object
   // is associated with the lifetime of the Render process. If the Renderer
   // crashes, its View is destroyed and this pointer becomes NULL, even though
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index eb48d85..6f2f089 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -781,23 +781,6 @@ TEST_F(RenderWidgetHostTest, StopAndStartHangMonitorTimeout) {
   EXPECT_TRUE(host_->unresponsive_timer_fired());
 }
 
-// Test that the hang monitor timer expires properly if it is started, then
-// updated to a shorter duration.
-TEST_F(RenderWidgetHostTest, ShorterDelayHangMonitorTimeout) {
-  // Start with a timeout.
-  host_->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(100));
-
-  // Start it again with shorter delay.
-  EXPECT_FALSE(host_->unresponsive_timer_fired());
-  host_->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(20));
-
-  // Wait long enough for first timeout and see if it fired.
-  MessageLoop::current()->PostDelayedTask(
-      FROM_HERE, MessageLoop::QuitClosure(), TimeDelta::FromMilliseconds(25));
-  MessageLoop::current()->Run();
-  EXPECT_TRUE(host_->unresponsive_timer_fired());
-}
-
 // Test that the hang monitor catches two input events but only one ack.
 // This can happen if the second input event causes the renderer to hang.
 // This test will catch a regression of crbug.com/111185.
diff --git a/content/browser/renderer_host/resource_dispatcher_host_impl.cc b/content/browser/renderer_host/resource_dispatcher_host_impl.cc
index 10f74eb..ecc525b 100644
--- a/content/browser/renderer_host/resource_dispatcher_host_impl.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host_impl.cc
@@ -289,13 +289,11 @@ net::RequestPriority DetermineRequestPriority(ResourceType::Type type) {
   }
 }
 
-void OnSwapOutACKHelper(int render_process_id,
-                        int render_view_id,
-                        bool timed_out) {
+void OnSwapOutACKHelper(int render_process_id, int render_view_id) {
   RenderViewHostImpl* rvh = RenderViewHostImpl::FromID(render_process_id,
                                                        render_view_id);
   if (rvh)
-    rvh->OnSwapOutACK(timed_out);
+    rvh->OnSwapOutACK();
 }
 
 net::Error CallbackAndReturn(
@@ -1102,20 +1100,8 @@ ResourceRequestInfoImpl* ResourceDispatcherHostImpl::CreateRequestInfo(
       context);
 }
 
-
 void ResourceDispatcherHostImpl::OnSwapOutACK(
-  const ViewMsg_SwapOut_Params& params) {
-  HandleSwapOutACK(params, false);
-}
-
-void ResourceDispatcherHostImpl::OnSimulateSwapOutACK(
     const ViewMsg_SwapOut_Params& params) {
-  // Call the real implementation with true, which means that we timed out.
-  HandleSwapOutACK(params, true);
-}
-
-void ResourceDispatcherHostImpl::HandleSwapOutACK(
-    const ViewMsg_SwapOut_Params& params, bool timed_out) {
   // Closes for cross-site transitions are handled such that the cross-site
   // transition continues.
   GlobalRequestID global_id(params.new_render_process_host_id,
@@ -1134,8 +1120,7 @@ void ResourceDispatcherHostImpl::HandleSwapOutACK(
       FROM_HERE,
       base::Bind(&OnSwapOutACKHelper,
                  params.closing_process_id,
-                 params.closing_route_id,
-                 timed_out));
+                 params.closing_route_id));
 }
 
 void ResourceDispatcherHostImpl::OnDidLoadResourceFromMemoryCache(
diff --git a/content/browser/renderer_host/resource_dispatcher_host_impl.h b/content/browser/renderer_host/resource_dispatcher_host_impl.h
index 7807a44..abfaee7 100644
--- a/content/browser/renderer_host/resource_dispatcher_host_impl.h
+++ b/content/browser/renderer_host/resource_dispatcher_host_impl.h
@@ -165,11 +165,6 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
   // Called when the unload handler for a cross-site request has finished.
   void OnSwapOutACK(const ViewMsg_SwapOut_Params& params);
 
-  // Called when we want to simulate the renderer process sending
-  // ViewHostMsg_SwapOut_ACK in cases where the renderer has died or is
-  // unresponsive.
-  void OnSimulateSwapOutACK(const ViewMsg_SwapOut_Params& params);
-
   // Called when the renderer loads a resource from its internal cache.
   void OnDidLoadResourceFromMemoryCache(const GURL& url,
                                         const std::string& security_info,
@@ -282,10 +277,6 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
   // A shutdown helper that runs on the IO thread.
   void OnShutdown();
 
-  // The real implementation of the OnSwapOutACK logic. Public methods call
-  // this method with the proper value for the timed_out parameter.
-  void HandleSwapOutACK(const ViewMsg_SwapOut_Params& params, bool timed_out);
-
   void StartRequest(net::URLRequest* request);
 
   // Returns true if the request is paused.
diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc
index 05e8262..ea5a4ec 100644
--- a/content/browser/renderer_host/test_render_view_host.cc
+++ b/content/browser/renderer_host/test_render_view_host.cc
@@ -283,7 +283,7 @@ void TestRenderViewHost::SetContentsMimeType(const std::string& mime_type) {
 }
 
 void TestRenderViewHost::SimulateSwapOutACK() {
-  OnSwapOutACK(false);
+  OnSwapOutACK();
 }
 
 void TestRenderViewHost::SimulateWasHidden() {
diff --git a/content/browser/web_contents/render_view_host_manager.cc b/content/browser/web_contents/render_view_host_manager.cc
index 06c15e2..a1d31d0 100644
--- a/content/browser/web_contents/render_view_host_manager.cc
+++ b/content/browser/web_contents/render_view_host_manager.cc
@@ -188,12 +188,10 @@ bool RenderViewHostManager::ShouldCloseTabOnUnresponsiveRenderer() {
     // handler later finishes, this call will be ignored because the state in
     // CrossSiteResourceHandler will already be cleaned up.)
     ViewMsg_SwapOut_Params params;
-    params.closing_process_id = render_view_host_->GetProcess()->GetID();
-    params.closing_route_id = render_view_host_->GetRoutingID();
     params.new_render_process_host_id =
         pending_render_view_host_->GetProcess()->GetID();
     params.new_request_id = pending_request_id;
-    current_host()->GetProcess()->SimulateSwapOutACK(params);
+    current_host()->GetProcess()->CrossSiteSwapOutACK(params);
   }
   return false;
 }
diff --git a/content/browser/web_contents/render_view_host_manager_unittest.cc b/content/browser/web_contents/render_view_host_manager_unittest.cc
index 57b3b96..8d9c159 100644
--- a/content/browser/web_contents/render_view_host_manager_unittest.cc
+++ b/content/browser/web_contents/render_view_host_manager_unittest.cc
@@ -174,7 +174,7 @@ class RenderViewHostManagerTest
     // 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(false);
+      old_rvh->OnSwapOutACK();
   }
 
   bool ShouldSwapProcesses(RenderViewHostManager* manager,
@@ -228,7 +228,7 @@ TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) {
   ASSERT_TRUE(dest_rvh2);
   ntp_rvh2->SendShouldCloseACK(true);
   dest_rvh2->SendNavigate(101, kDestUrl);
-  ntp_rvh2->OnSwapOutACK(false);
+  ntp_rvh2->OnSwapOutACK();
 
   // The two RVH's should be different in every way.
   EXPECT_NE(active_rvh()->GetProcess(), dest_rvh2->GetProcess());
@@ -246,7 +246,7 @@ TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) {
   dest_rvh2->SendShouldCloseACK(true);
   static_cast<TestRenderViewHost*>(contents2.GetRenderManagerForTesting()->
      pending_render_view_host())->SendNavigate(102, kNtpUrl);
-  dest_rvh2->OnSwapOutACK(false);
+  dest_rvh2->OnSwapOutACK();
 
   EXPECT_EQ(active_rvh()->GetSiteInstance(),
       contents2.GetRenderViewHost()->GetSiteInstance());
@@ -583,7 +583,7 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) {
                               host2->GetPendingRequestId());
   EXPECT_TRUE(test_process_host->sink().GetUniqueMessageMatching(
       ViewMsg_SwapOut::ID));
-  test_host->OnSwapOutACK(false);
+  test_host->OnSwapOutACK();
 
   EXPECT_EQ(host, manager.current_host());
   EXPECT_FALSE(static_cast<RenderViewHostImpl*>(
@@ -631,7 +631,7 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) {
                                   host3)->GetPendingRequestId());
   EXPECT_TRUE(test_process_host->sink().GetUniqueMessageMatching(
       ViewMsg_SwapOut::ID));
-  test_host->OnSwapOutACK(false);
+  test_host->OnSwapOutACK();
 
   // Commit.
   manager.DidNavigateMainFrame(host3);
diff --git a/content/browser/web_contents/test_web_contents.cc b/content/browser/web_contents/test_web_contents.cc
index c5bf1fb..0b303c6 100644
--- a/content/browser/web_contents/test_web_contents.cc
+++ b/content/browser/web_contents/test_web_contents.cc
@@ -138,7 +138,7 @@ void TestWebContents::CommitPendingNavigation() {
   // 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() {
diff --git a/content/public/browser/render_process_host.h b/content/public/browser/render_process_host.h
index 99ddab6..a27e66f 100644
--- a/content/public/browser/render_process_host.h
+++ b/content/public/browser/render_process_host.h
@@ -74,7 +74,8 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::Message::Sender,
   // ResourceDispatcherHost.  Necessary for a cross-site request, in the case
   // that the original RenderViewHost is not live and thus cannot run an
   // unload handler.
-  virtual void SimulateSwapOutACK(const ViewMsg_SwapOut_Params& params) = 0;
+  virtual void CrossSiteSwapOutACK(
+      const ViewMsg_SwapOut_Params& params) = 0;
 
   // Called to wait for the next UpdateRect message for the specified render
   // widget.  Returns true if successful, and the msg out-param will contain a
diff --git a/content/test/data/english_page.html b/content/test/data/english_page.html
deleted file mode 100644
index 30b0d42..0000000
--- a/content/test/data/english_page.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head><title>This page is in English</title></head>
-<body>
-No joke! This is a page written in English. Awesome don't you think?
-It has to be more than 100 bytes long for the CLD to detect the language correctly.
-</body>
-</html>
diff --git a/content/test/data/infinite_beforeunload.html b/content/test/data/infinite_beforeunload.html
deleted file mode 100644
index 5a3e017..0000000
--- a/content/test/data/infinite_beforeunload.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head>
-  <title>Infinite beforeunload</title>
-</head>
-
-<body>
-<script>
-  window.onbeforeunload = function(e) {
-      while(true){}
-  }
-</script>
-
-Infinite beforeunload handler.
-
-</body>
-
-</html>
diff --git a/content/test/data/infinite_unload.html b/content/test/data/infinite_unload.html
deleted file mode 100644
index 742df08..0000000
--- a/content/test/data/infinite_unload.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head>
-  <title>Infinite unload</title>
-</head>
-
-<body>
-<script>
-  window.onunload = function(e) {
-      while(true){}
-  }
-</script>
-
-Infinite unload handler.
-
-</body>
-
-</html>
diff --git a/content/test/mock_render_process_host.cc b/content/test/mock_render_process_host.cc
index 2a16e00..03c2c27 100644
--- a/content/test/mock_render_process_host.cc
+++ b/content/test/mock_render_process_host.cc
@@ -54,7 +54,7 @@ int MockRenderProcessHost::GetNextRoutingID() {
 void MockRenderProcessHost::CancelResourceRequests(int render_widget_id) {
 }
 
-void MockRenderProcessHost::SimulateSwapOutACK(
+void MockRenderProcessHost::CrossSiteSwapOutACK(
     const ViewMsg_SwapOut_Params& params) {
 }
 
diff --git a/content/test/mock_render_process_host.h b/content/test/mock_render_process_host.h
index b700697..7d4b50a 100644
--- a/content/test/mock_render_process_host.h
+++ b/content/test/mock_render_process_host.h
@@ -37,7 +37,7 @@ class MockRenderProcessHost : public RenderProcessHost {
   virtual bool Init() OVERRIDE;
   virtual int GetNextRoutingID() OVERRIDE;
   virtual void CancelResourceRequests(int render_widget_id) OVERRIDE;
-  virtual void SimulateSwapOutACK(
+  virtual void CrossSiteSwapOutACK(
       const ViewMsg_SwapOut_Params& params) OVERRIDE;
   virtual bool WaitForBackingStoreMsg(int render_widget_id,
                                       const base::TimeDelta& max_delay,