InfoBarService inherits from InfoBarManager

chrome/browser/download/download_browsertest.cc

Index: chrome/browser/download/download_browsertest.cc
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index c4de117fee07423e24252ccff31ff813e0ed5941..8eb596fa9d99adcc4c24d9940b9750b07ae0a049 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -44,7 +44,6 @@
 #include "chrome/browser/history/history_service_factory.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/net/url_request_mock_util.h"
 #include "chrome/browser/profiles/profile.h"
@@ -2793,12 +2792,11 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, TestMultipleDownloadsInfobar) {
 
   InfoBarService* infobar_service = InfoBarService::FromWebContents(
        browser()->tab_strip_model()->GetActiveWebContents());
-  InfoBarManager* infobar_manager = infobar_service->infobar_manager();
   // Verify that there is only one infobar.
-  ASSERT_EQ(1u, infobar_manager->infobar_count());
+  ASSERT_EQ(1u, infobar_service->infobar_count());
 
   // Get the infobar at index 0.
-  InfoBar* infobar = infobar_manager->infobar_at(0);
+  InfoBar* infobar = infobar_service->infobar_at(0);
   ConfirmInfoBarDelegate* confirm_infobar =
       infobar->delegate()->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(confirm_infobar != NULL);
@@ -2809,9 +2807,9 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, TestMultipleDownloadsInfobar) {
 
   // Click on the "Allow" button to allow multiple downloads.
   if (confirm_infobar->Accept())
-    infobar_manager->RemoveInfoBar(infobar);
+    infobar_service->RemoveInfoBar(infobar);
   // Verify that there are no more infobars.
-  EXPECT_EQ(0u, infobar_manager->infobar_count());
+  EXPECT_EQ(0u, infobar_service->infobar_count());
 
   // Waits for the download to complete.
   downloads_observer->WaitForFinished();