Merge 21531 - Fix a race condition where rapid back/forward clicks could clos...

chrome/browser/renderer_host/render_widget_helper.cc

Index: chrome/browser/renderer_host/render_widget_helper.cc
===================================================================
--- chrome/browser/renderer_host/render_widget_helper.cc	(revision 21759)
+++ chrome/browser/renderer_host/render_widget_helper.cc	(working copy)
@@ -84,14 +84,13 @@
   }
 }
 
-void RenderWidgetHelper::CrossSiteClosePageACK(int new_render_process_host_id,
-                                               int new_request_id) {
+void RenderWidgetHelper::CrossSiteClosePageACK(
+    const ViewMsg_ClosePage_Params& params) {
   if (g_browser_process->io_thread()) {
     g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(this,
                           &RenderWidgetHelper::OnCrossSiteClosePageACK,
-                          new_render_process_host_id,
-                          new_request_id));
+                          params));
   }
 }
 
@@ -196,10 +195,8 @@
 }
 
 void RenderWidgetHelper::OnCrossSiteClosePageACK(
-    int new_render_process_host_id,
-    int new_request_id) {
-  resource_dispatcher_host_->OnClosePageACK(
-      new_render_process_host_id, new_request_id);
+    ViewMsg_ClosePage_Params params) {
+  resource_dispatcher_host_->OnClosePageACK(params);
 }
 
 void RenderWidgetHelper::CreateNewWindow(int opener_id,
Property changes on: chrome\browser\renderer_host\render_widget_helper.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/renderer_host/render_widget_helper.cc:r21531