Split InfoBarService core code into InfoBarManager

chrome/browser/autofill/autofill_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 <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/chrome_notification_types.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/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
@@ skipping 31 matching lines @@
         has_run_message_loop_(false),
         browser_(browser),
         infobar_service_(NULL) {
     PersonalDataManagerFactory::GetForProfile(browser_->profile())->
         AddObserver(this);
     registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
                    content::NotificationService::AllSources());
   }
 
   virtual ~WindowedPersonalDataManagerObserver() {
-    if (infobar_service_ && (infobar_service_->infobar_count() > 0))
-      infobar_service_->RemoveInfoBar(infobar_service_->infobar_at(0));
+    if (infobar_service_ &&
+        (infobar_service_->infobar_manager()->infobar_count() > 0)) {
+      InfoBarManager* infobar_manager = infobar_service_->infobar_manager();
+      infobar_manager->RemoveInfoBar(infobar_manager->infobar_at(0));
+    }
   }
 
   void Wait() {
     if (!alerted_) {
       has_run_message_loop_ = true;
       content::RunMessageLoop();
     }
     PersonalDataManagerFactory::GetForProfile(browser_->profile())->
         RemoveObserver(this);
   }
@@ skipping 11 matching lines @@
     OnPersonalDataChanged();
   }
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     EXPECT_EQ(chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, type);
     infobar_service_ = InfoBarService::FromWebContents(
         browser_->tab_strip_model()->GetActiveWebContents());
+    InfoBarManager* infobar_manager = infobar_service_->infobar_manager();
     ConfirmInfoBarDelegate* infobar_delegate =
-        infobar_service_->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate();
+        infobar_manager->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate();
     ASSERT_TRUE(infobar_delegate);
     infobar_delegate->Accept();
   }
 
  private:
   bool alerted_;
   bool has_run_message_loop_;
   Browser* browser_;
   content::NotificationRegistrar registrar_;
   InfoBarService* infobar_service_;
@@ skipping 363 matching lines @@
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   ASSERT_TRUE(test_server()->Start());
   std::string card("4408 0412 3456 7890");
   ASSERT_FALSE(autofill::IsValidCreditCardNumber(ASCIIToUTF16(card)));
   SubmitCreditCard("Bob Smith", card.c_str(), "12", "2014");
-  ASSERT_EQ(0u,
-            InfoBarService::FromWebContents(
-                browser()->tab_strip_model()->GetActiveWebContents())->
-                    infobar_count());
+  InfoBarService* infobar_service = InfoBarService::FromWebContents(
+      browser()->tab_strip_model()->GetActiveWebContents());
+  ASSERT_EQ(0u, infobar_service->infobar_manager()->infobar_count());
 }
 
 // Test whitespaces and separator chars are stripped for valid CC numbers.
 // The credit card numbers used in this test pass the Luhn test. For reference:
 // http://www.merriampark.com/anatomycc.htm
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        WhitespacesAndSeparatorCharsStrippedForValidCCNums) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
@@ skipping 163 matching lines @@
 #endif
 
   ASSERT_TRUE(test_server()->Start());
   FormMap data;
   data["CREDIT_CARD_NAME"] = "Bob Smith";
   data["CREDIT_CARD_NUMBER"] = "4408041234567893";
   data["CREDIT_CARD_EXP_MONTH"] = "12";
   data["CREDIT_CARD_EXP_4_DIGIT_YEAR"] = "2014";
   FillFormAndSubmit("cc_autocomplete_off_test.html", data);
 
-  ASSERT_EQ(0u,
-            InfoBarService::FromWebContents(
-                browser()->tab_strip_model()->GetActiveWebContents())->
-                    infobar_count());
+  InfoBarService* infobar_service = InfoBarService::FromWebContents(
+      browser()->tab_strip_model()->GetActiveWebContents());
+  ASSERT_EQ(0u, infobar_service->infobar_manager()->infobar_count());
 }
 
 // Test profile not aggregated if email found in non-email field.
 IN_PROC_BROWSER_TEST_F(AutofillTest, ProfileWithEmailInOtherFieldNotSaved) {
   ASSERT_TRUE(test_server()->Start());
 
   FormMap data;
   data["NAME_FIRST"] = "Bob";
   data["NAME_LAST"] = "Smith";
   data["ADDRESS_HOME_LINE1"] = "bsmith@gmail.com";
@@ skipping 38 matching lines @@
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_MergeAggregatedDuplicatedProfiles) {
   int num_of_profiles =
       AggregateProfilesIntoAutofillPrefs("dataset_duplicated_profiles.txt");
 
   ASSERT_GT(num_of_profiles,
             static_cast<int>(personal_data_manager()->GetProfiles().size()));
 }
 
 }  // namespace autofill