Split InfoBarService core code into InfoBarManager

chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/infobars/infobar.h"
+#include "chrome/browser/infobars/infobar_manager.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
 // static
 void PopupBlockedInfoBarDelegate::Create(content::WebContents* web_contents,
                                          int num_popups) {
   const GURL& url = web_contents->GetURL();
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   scoped_ptr<InfoBar> infobar(ConfirmInfoBarDelegate::CreateInfoBar(
       scoped_ptr<ConfirmInfoBarDelegate>(
           new PopupBlockedInfoBarDelegate(
                 num_popups, url, profile->GetHostContentSettingsMap()))));
 
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents);
+  InfoBarManager* infobar_manager =
+      InfoBarService::FromWebContents(web_contents)->infobar_manager();
   // See if there is an existing popup infobar already.
   // TODO(dfalcantara) When triggering more than one popup the infobar
   // will be shown once, then hide then be shown again.
   // This will be fixed once we have an in place replace infobar mechanism.
-  for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
-    InfoBar* existing_infobar = infobar_service->infobar_at(i);
+  for (size_t i = 0; i < infobar_manager->infobar_count(); ++i) {
+    InfoBar* existing_infobar = infobar_manager->infobar_at(i);
     if (existing_infobar->delegate()->AsPopupBlockedInfoBarDelegate()) {
-      infobar_service->ReplaceInfoBar(existing_infobar, infobar.Pass());
+      infobar_manager->ReplaceInfoBar(existing_infobar, infobar.Pass());
       return;
     }
   }
 
-  infobar_service->AddInfoBar(infobar.Pass());
+  infobar_manager->AddInfoBar(infobar.Pass());
 }
 
 PopupBlockedInfoBarDelegate::~PopupBlockedInfoBarDelegate() {
 }
 
 int PopupBlockedInfoBarDelegate::GetIconID() const {
   return IDR_BLOCKED_POPUPS;
 }
 
 PopupBlockedInfoBarDelegate*
@@ skipping 48 matching lines @@
   DCHECK(popup_blocker_helper);
   PopupBlockerTabHelper::PopupIdMap blocked_popups =
       popup_blocker_helper->GetBlockedPopupRequests();
   for (PopupBlockerTabHelper::PopupIdMap::iterator it = blocked_popups.begin();
       it != blocked_popups.end(); ++it)
     popup_blocker_helper->ShowBlockedPopup(it->first);
 
   return true;
 }