Split InfoBarService core code into InfoBarManager

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"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
 #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"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/lazy_background_task_queue.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/manifest_handlers/background_info.h"
@@ skipping 241 matching lines @@
                                                 &contents,
                                                 &tab_index)) {
     error_ = extensions::ErrorUtils::FormatErrorMessage(
         extensions::tabs_constants::kTabNotFoundError,
         base::IntToString(tab_id));
     return false;
   }
 
   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 =
           confirm_infobar_delegate->GetMessageText();
       alert_value->SetString(keys::kMessageKey, message_text);
       alerts_value->Append(alert_value);
     }
   }
 
   SetResult(alerts_value);
   return true;
 }