Split InfoBarService core code into InfoBarManager

chrome/browser/extensions/extension_install_ui_browsertest.cc

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.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/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/common/url_constants.h"
@@ skipping 10 matching lines @@
 using extensions::Extension;
 
 class ExtensionInstallUIBrowserTest : public ExtensionBrowserTest {
  public:
   // Checks that a theme info bar is currently visible and issues an undo to
   // revert to the previous theme.
   void VerifyThemeInfoBarAndUndoInstall() {
     WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     ASSERT_TRUE(web_contents);
-    InfoBarService* infobar_service =
-        InfoBarService::FromWebContents(web_contents);
-    ASSERT_EQ(1U, infobar_service->infobar_count());
+    InfoBarManager* infobar_manager =
+        InfoBarService::FromWebContents(web_contents)->infobar_manager();
+    ASSERT_EQ(1U, infobar_manager->infobar_count());
     ConfirmInfoBarDelegate* delegate =
-        infobar_service->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate();
+        infobar_manager->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate();
     ASSERT_TRUE(delegate);
     delegate->Cancel();
-    ASSERT_EQ(0U, infobar_service->infobar_count());
+    ASSERT_EQ(0U, infobar_manager->infobar_count());
   }
 
   // Install the given theme from the data dir and verify expected name.
   void InstallThemeAndVerify(const char* theme_name,
                              const std::string& expected_name) {
     // If there is already a theme installed, the current theme should be
     // disabled and the new one installed + enabled.
     int expected_change = GetTheme() ? 0 : 1;
     const base::FilePath theme_path = test_data_dir_.AppendASCII(theme_name);
     ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(theme_path, expected_change,
@@ skipping 181 matching lines @@
   sorting->OnExtensionMoved(
       app_id, base::EmptyString(), extension_misc::kWebStoreAppId);
   EXPECT_EQ(app_id, last_reordered_extension_id_);
 
   // Now install the app.
   const extensions::Extension* test_app = LoadExtension(app_dir);
   ASSERT_TRUE(test_app);
   EXPECT_TRUE(service->GetInstalledExtension(app_id));
   EXPECT_EQ(app_id, test_app->id());
 }