Infobar Componentization Proof of Concept

chrome/browser/accessibility/accessibility_extension_api.cc

Index: chrome/browser/accessibility/accessibility_extension_api.cc
diff --git a/chrome/browser/accessibility/accessibility_extension_api.cc b/chrome/browser/accessibility/accessibility_extension_api.cc
index 7cd5241b94f7f58c2246b0bfbdfad648fd5942cd..f853131617e16bbce34a60e54fec11321a4dd857 100644
--- a/chrome/browser/accessibility/accessibility_extension_api.cc
+++ b/chrome/browser/accessibility/accessibility_extension_api.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar.h"
+#include "chrome/browser/infobars/infobar_manager.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/experimental_accessibility.h"
@@ -274,11 +275,12 @@ bool AccessibilityGetAlertsForTabFunction::RunImpl() {
 
   base::ListValue* alerts_value = new base::ListValue;
 
-  InfoBarService* infobar_service = InfoBarService::FromWebContents(contents);
-  for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
+  InfoBarManager& infobar_manager =
+      InfoBarService::FromWebContents(contents)->infobar_manager();
+  for (size_t i = 0; i < infobar_manager.infobar_count(); ++i) {
     // TODO(hashimoto): Make other kind of alerts available.  crosbug.com/24281
     ConfirmInfoBarDelegate* confirm_infobar_delegate =
-        infobar_service->infobar_at(i)->delegate()->AsConfirmInfoBarDelegate();
+        infobar_manager.infobar_at(i)->delegate()->AsConfirmInfoBarDelegate();
     if (confirm_infobar_delegate) {
       base::DictionaryValue* alert_value = new base::DictionaryValue;
       const base::string16 message_text =