Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/accessibility/accessibility_extension_api.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/accessibility/accessibility_extension_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/accessibility/accessibility_extension_api_constants.h"
@@ skipping 195 matching lines @@
                                     NULL, &tab_strip, &contents, &tab_index)) {
     error_ = extensions::ErrorUtils::FormatErrorMessage(
         extensions::tabs_constants::kTabNotFoundError,
         base::IntToString(tab_id));
     return false;
   }
 
   ListValue* alerts_value = new ListValue;
 
   InfoBarService* infobar_service = InfoBarService::FromWebContents(contents);
-  for (size_t i = 0; i < infobar_service->GetInfoBarCount(); ++i) {
+  for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
     // TODO(hashimoto): Make other kind of alerts available.  crosbug.com/24281
     ConfirmInfoBarDelegate* confirm_infobar_delegate =
-        infobar_service->GetInfoBarDelegateAt(i)->AsConfirmInfoBarDelegate();
+        infobar_service->infobar_at(i)->AsConfirmInfoBarDelegate();
     if (confirm_infobar_delegate) {
       DictionaryValue* alert_value = new DictionaryValue;
       const string16 message_text = confirm_infobar_delegate->GetMessageText();
       alert_value->SetString(keys::kMessageKey, message_text);
       alerts_value->Append(alert_value);
     }
   }
 
   SetResult(alerts_value);
   return true;
 }