Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

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/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 119 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_)
-      return;
-
-    InfoBarDelegate* infobar = NULL;
-    if (infobar_service_->GetInfoBarCount() > 0 &&
-        (infobar = infobar_service_->GetInfoBarDelegateAt(0))) {
-      infobar_service_->RemoveInfoBar(infobar);
-    }
+    if (infobar_service_ && infobar_service_->infobar_count() > 0)
+      infobar_service_->RemoveInfoBar(infobar_service_->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 {
     // Accept in the infobar.
     infobar_service_ = InfoBarService::FromWebContents(
         browser_->tab_strip_model()->GetActiveWebContents());
-    InfoBarDelegate* infobar = infobar_service_->GetInfoBarDelegateAt(0);
+    InfoBarDelegate* infobar = infobar_service_->infobar_at(0);
 
     ConfirmInfoBarDelegate* confirm_infobar =
         infobar->AsConfirmInfoBarDelegate();
     confirm_infobar->Accept();
   }
 
  private:
   bool alerted_;
   bool has_run_message_loop_;
   Browser* browser_;
@@ skipping 763 matching lines @@
                "<label for=\"ph\">Phone number:</label>"
                " <input type=\"text\" id=\"ph\"><br>"
                "</form>");
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(), url));
 
   // Get translation bar.
   RenderViewHostTester::TestOnMessageReceived(
       render_view_host(),
       ChromeViewHostMsg_TranslateLanguageDetermined(0, "ja", true));
   TranslateInfoBarDelegate* infobar = InfoBarService::FromWebContents(
-      browser()->tab_strip_model()->GetActiveWebContents())->
-          GetInfoBarDelegateAt(0)->AsTranslateInfoBarDelegate();
+      browser()->tab_strip_model()->GetActiveWebContents())->infobar_at(0)->
+          AsTranslateInfoBarDelegate();
 
   ASSERT_TRUE(infobar != NULL);
   EXPECT_EQ(TranslateInfoBarDelegate::BEFORE_TRANSLATE,
             infobar->infobar_type());
 
   // Simulate translation button press.
   infobar->Translate();
 
   // Simulate the translate script being retrieved.
   // Pass fake google.translate lib as the translate script.
@@ skipping 213 matching lines @@
 // pass the Luhn test) the credit card info should not be saved into Autofill
 // preferences.
 IN_PROC_BROWSER_TEST_F(AutofillTest, InvalidCreditCardNumberIsNotAggregated) {
   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())->
-                    GetInfoBarCount());
+                    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) {
   ASSERT_TRUE(test_server()->Start());
   SubmitCreditCard("Bob Smith", "4408 0412 3456 7893", "12", "2014");
   SubmitCreditCard("Jane Doe", "4417-1234-5678-9113", "10", "2013");
@@ skipping 202 matching lines @@
   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())->
-                    GetInfoBarCount());
+                    infobar_count());
 }
 
 // http://crbug.com/150084
 #if defined(OS_MACOSX)
 #define MAYBE_NoAutofillForReadOnlyFields NoAutofillForReadOnlyFields
 #else
 #define MAYBE_NoAutofillForReadOnlyFields DISABLED_NoAutofillForReadOnlyFields
 #endif
 // Test that Autofill does not fill in read-only fields.
 IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_NoAutofillForReadOnlyFields) {
@@ skipping 284 matching lines @@
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_MergeAggregatedDuplicatedProfiles) {
   int num_of_profiles =
       AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt");
 
   ASSERT_GT(num_of_profiles,
             static_cast<int>(personal_data_manager()->GetProfiles().size()));
 }
 
 }  // namespace autofill