Split InfoBarService core code into InfoBarManager

chrome/browser/media/webrtc_browsertest_base.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/media/webrtc_browsertest_base.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/infobar.h"
+#include "chrome/browser/infobars/infobar_manager.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/media/media_stream_infobar_delegate.h"
 #include "chrome/browser/media/webrtc_browsertest_common.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
@@ skipping 180 matching lines @@
   return tab_contents;
 }
 
 void WebRtcTestBase::CloseInfoBarInTab(
     content::WebContents* tab_contents,
     InfoBar* infobar) const {
   content::WindowedNotificationObserver infobar_removed(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
       content::NotificationService::AllSources());
 
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(tab_contents);
-  infobar_service->RemoveInfoBar(infobar);
+  InfoBarManager* infobar_manager =
+      InfoBarService::FromWebContents(tab_contents)->infobar_manager();
+  infobar_manager->RemoveInfoBar(infobar);
 
   infobar_removed.Wait();
 }
 
 // Convenience method which executes the provided javascript in the context
 // of the provided web contents and returns what it evaluated to.
 std::string WebRtcTestBase::ExecuteJavascript(
     const std::string& javascript,
     content::WebContents* tab_contents) const {
   std::string result;
@@ skipping 50 matching lines @@
   std::string javascript = base::StringPrintf(
       "startDetection('%s', 320, 240)", video_element.c_str());
   EXPECT_EQ("ok-started", ExecuteJavascript(javascript, tab_contents));
 }
 
 void WebRtcTestBase::WaitForVideoToPlay(
     content::WebContents* tab_contents) const {
   EXPECT_TRUE(test::PollingWaitUntil("isVideoPlaying()", "video-playing",
                                      tab_contents));
 }