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

chrome/browser/tab_contents/tab_contents.cc

Index: chrome/browser/tab_contents/tab_contents.cc
===================================================================
--- chrome/browser/tab_contents/tab_contents.cc	(revision 21805)
+++ chrome/browser/tab_contents/tab_contents.cc	(working copy)
@@ -2196,10 +2196,6 @@
       this, l10n_util::GetString(IDS_JS_OUT_OF_MEMORY_PROMPT), NULL));
 }
 
-void TabContents::ShouldClosePage(bool proceed) {
-  render_manager_.ShouldClosePage(proceed);
-}
-
 void TabContents::OnCrossSiteResponse(int new_render_process_host_id,
                                       int new_request_id) {
   // Allows the TabContents to react when a cross-site response is ready to be
Property changes on: chrome\browser\tab_contents\tab_contents.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/tab_contents/tab_contents.cc:r21685