Revert 42366 - Allow TabContentsDelegate classes to specify whether InfoBars ...

chrome/browser/external_tab_container.cc

Index: chrome/browser/external_tab_container.cc
===================================================================
--- chrome/browser/external_tab_container.cc	(revision 42377)
+++ chrome/browser/external_tab_container.cc	(working copy)
@@ -54,8 +54,7 @@
       external_method_factory_(this),
       enabled_extension_automation_(false),
       waiting_for_unload_event_(false),
-      pending_(false),
-      infobars_enabled_(true) {
+      pending_(false) {
 }
 
 ExternalTabContainer::~ExternalTabContainer() {
@@ -70,8 +69,7 @@
                                 bool handle_top_level_requests,
                                 TabContents* existing_contents,
                                 const GURL& initial_url,
-                                const GURL& referrer,
-                                bool infobars_enabled) {
+                                const GURL& referrer) {
   if (IsWindow()) {
     NOTREACHED();
     return false;
@@ -79,7 +77,6 @@
 
   load_requests_via_automation_ = load_requests_via_automation;
   handle_top_level_requests_ = handle_top_level_requests;
-  infobars_enabled_ = infobars_enabled;
 
   set_window_style(WS_POPUP | WS_CLIPCHILDREN);
   views::WidgetWin::Init(NULL, bounds);
@@ -354,8 +351,7 @@
       handle_top_level_requests_,
       new_contents,
       GURL(),
-      GURL(),
-      true);
+      GURL());
 
   if (result) {
     uintptr_t cookie = reinterpret_cast<uintptr_t>(new_container.get());
@@ -383,10 +379,6 @@
   RegisterRenderViewHostForAutomation(rvh, true);
 }
 
-bool ExternalTabContainer::infobars_enabled() {
-  return infobars_enabled_;
-}
-
 void ExternalTabContainer::ActivateContents(TabContents* contents) {
 }