Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/automation/testing_automation_provider.cc

 // Copyright 2013 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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 2081 matching lines @@
   if (args->GetInteger("height", &height))
     rect.set_height(height);
   browser->window()->SetBounds(rect);
   AutomationJSONReply(this, reply_message).SendSuccess(NULL);
 }
 
 ListValue* TestingAutomationProvider::GetInfobarsInfo(WebContents* wc) {
   // Each infobar may have different properties depending on the type.
   ListValue* infobars = new ListValue;
   InfoBarService* infobar_service = InfoBarService::FromWebContents(wc);
-  for (size_t i = 0; i < infobar_service->GetInfoBarCount(); ++i) {
+  for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
     DictionaryValue* infobar_item = new DictionaryValue;
-    InfoBarDelegate* infobar = infobar_service->GetInfoBarDelegateAt(i);
+    InfoBarDelegate* infobar = infobar_service->infobar_at(i);
     switch (infobar->GetInfoBarAutomationType()) {
       case InfoBarDelegate::CONFIRM_INFOBAR:
         infobar_item->SetString("type", "confirm_infobar");
         break;
       case InfoBarDelegate::ONE_CLICK_LOGIN_INFOBAR:
         infobar_item->SetString("type", "oneclicklogin_infobar");
         break;
       case InfoBarDelegate::PASSWORD_INFOBAR:
         infobar_item->SetString("type", "password_infobar");
         break;
@@ skipping 59 matching lines @@
       browser->tab_strip_model()->GetWebContentsAt(tab_index);
   if (!web_contents) {
     reply.SendError(base::StringPrintf("No such tab at index %d", tab_index));
     return;
   }
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
 
   InfoBarDelegate* infobar = NULL;
   size_t infobar_index = static_cast<size_t>(infobar_index_int);
-  if (infobar_index >= infobar_service->GetInfoBarCount()) {
+  if (infobar_index >= infobar_service->infobar_count()) {
     reply.SendError(base::StringPrintf("No such infobar at index %" PRIuS,
                                        infobar_index));
     return;
   }
-  infobar = infobar_service->GetInfoBarDelegateAt(infobar_index);
+  infobar = infobar_service->infobar_at(infobar_index);
 
   if ("dismiss" == action) {
     infobar->InfoBarDismissed();
     infobar_service->RemoveInfoBar(infobar);
     reply.SendSuccess(NULL);
     return;
   }
   if ("accept" == action || "cancel" == action) {
     ConfirmInfoBarDelegate* confirm_infobar;
     if (!(confirm_infobar = infobar->AsConfirmInfoBarDelegate())) {
@@ skipping 3744 matching lines @@
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
                                                   WebContents* tab) {
   TabStripModel* tab_strip = browser->tab_strip_model();
   if (tab_strip->GetActiveWebContents() != tab)
     tab_strip->ActivateTabAt(tab_strip->GetIndexOfWebContents(tab), true);
 }