Split InfoBarService core code into InfoBarManager

chrome/browser/ui/gtk/browser_window_gtk.cc

Index: chrome/browser/ui/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 58288972d72b7aee719122f1291ba2f93ef6dd9d..27b179220e6653c6cdb69f18c9674703600b50d6 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -802,8 +802,9 @@ void BrowserWindowGtk::OnActiveTabChanged(WebContents* old_contents,
 
   // Update various elements that are interested in knowing the current
   // WebContents.
-  infobar_container_->ChangeInfoBarService(
-      InfoBarService::FromWebContents(new_contents));
+  InfoBarManager* infobar_manager =
+      InfoBarService::InfoBarManagerFromWebContents(new_contents);
+  infobar_container_->ChangeInfoBarManager(infobar_manager);
   contents_container_->SetTab(new_contents);
   UpdateDevToolsForContents(new_contents);
 
@@ -1285,7 +1286,7 @@ void BrowserWindowGtk::TabDetachedAt(WebContents* contents, int index) {
   // browser_->tab_strip_model()->GetActiveWebContents() will return NULL or
   // something else.
   if (index == browser_->tab_strip_model()->active_index()) {
-    infobar_container_->ChangeInfoBarService(NULL);
+    infobar_container_->ChangeInfoBarManager(NULL);
     UpdateDevToolsForContents(NULL);
   }
   contents_container_->DetachTab(contents);