Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/extensions/theme_installed_infobar_delegate.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 "chrome/browser/extensions/theme_installed_infobar_delegate.h"
 
 #include <string>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 30 matching lines @@
 
   content::WebContents* web_contents =
       browser->tab_strip_model()->GetActiveWebContents();
   if (!web_contents)
     return;
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
 
   // First find any previous theme preview infobars.
   InfoBarDelegate* old_delegate = NULL;
-  for (size_t i = 0; i < infobar_service->GetInfoBarCount(); ++i) {
-    InfoBarDelegate* delegate = infobar_service->GetInfoBarDelegateAt(i);
+  for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
+    InfoBarDelegate* delegate = infobar_service->infobar_at(i);
     ThemeInstalledInfoBarDelegate* theme_infobar =
         delegate->AsThemePreviewInfobarDelegate();
     if (theme_infobar) {
       // If the user installed the same theme twice, ignore the second install
       // and keep the first install info bar, so that they can easily undo to
       // get back the previous theme.
       if (theme_infobar->theme_id_ == new_theme->id())
         return;
       old_delegate = delegate;
       break;
@@ skipping 93 matching lines @@
 void ThemeInstalledInfoBarDelegate::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_BROWSER_THEME_CHANGED, type);
   // If the new theme is different from what this info bar is associated with,
   // close this info bar since it is no longer relevant.
   if (theme_id_ != theme_service_->GetThemeID())
     RemoveSelf();
 }