Merge 21685 - Relanding r21673 without reenabling the BrowserTest, which appa...

chrome/browser/browser.cc

Index: chrome/browser/browser.cc
===================================================================
--- chrome/browser/browser.cc	(revision 21805)
+++ chrome/browser/browser.cc	(working copy)
@@ -1562,7 +1562,7 @@
     // them. Once they have fired, we'll get a message back saying whether
     // to proceed closing the page or not, which sends us back to this method
     // with the HasUnloadListener bit cleared.
-    contents->render_view_host()->FirePageBeforeUnload();
+    contents->render_view_host()->FirePageBeforeUnload(false);
     return true;
   }
   return false;
@@ -2473,7 +2473,7 @@
     // Null check render_view_host here as this gets called on a PostTask and
     // the tab's render_view_host may have been nulled out.
     if (tab->render_view_host()) {
-      tab->render_view_host()->FirePageBeforeUnload();
+      tab->render_view_host()->FirePageBeforeUnload(false);
     } else {
       ClearUnloadState(tab);
     }
Property changes on: chrome\browser\browser.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/browser.cc:r21685