Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/managed_mode/managed_mode_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/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar.h"
-#include "chrome/browser/infobars/infobar_tab_helper.h"
+#include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/managed_mode/managed_mode.h"
 #include "chrome/browser/managed_mode/managed_mode_interstitial.h"
 #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
@@ skipping 102 matching lines @@
 
   bool IsAlreadyAddedInfobarPresent() {
     return IsInfobarPresent(IDS_MANAGED_MODE_ALREADY_ADDED_MESSAGE);
   }
 
   // Checks whether the correct infobar is present.
   bool IsInfobarPresent(int message_id) {
     InfoBarService* service = InfoBarService::FromWebContents(
         browser()->tab_strip_model()->GetActiveWebContents());
 
-    for (unsigned int i = 0; i < service->GetInfoBarCount(); ++i) {
+    for (size_t i = 0; i < service->infobar_count(); ++i) {
       ConfirmInfoBarDelegate* delegate =
-          service->GetInfoBarDelegateAt(i)->AsConfirmInfoBarDelegate();
+          service->infobar_at(i)->AsConfirmInfoBarDelegate();
       if (delegate->GetMessageText() == l10n_util::GetStringUTF16(message_id))
         return true;
     }
     return false;
   }
 
   // Acts on the interstitial and infobar according to the values set to
   // |interstitial_action| and |infobar_action|.
   void ActOnInterstitialAndInfobar(WebContents* tab,
                                    InterstitialAction interstitial_action,
@@ skipping 473 matching lines @@
   // Simulate the click on the "preview" button.
   delegate->CommandReceived("\"preview\"");
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(tab);
   EXPECT_TRUE(web_contents_modal_dialog_manager->IsShowingDialog());
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace