Infobar Componentization Proof of Concept

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 e1ec1c9d7e0c2dc0177a6d623e98b4db26101459..1a55de9e406ab05f3882dc50a44407204db6b1ba 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -43,6 +43,7 @@
 #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"
@@ -2790,13 +2791,15 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, TestMultipleDownloadsInfobar) {
      test_server()->GetURL("files/downloads/download-a_zip_file.html"));
   infobar_added_1.Wait();
 
-  InfoBarService* infobar_service = InfoBarService::FromWebContents(
-       browser()->tab_strip_model()->GetActiveWebContents());
+  InfoBarManager& infobar_manager =
+      InfoBarService::FromWebContents(
+          browser()->tab_strip_model()->GetActiveWebContents())
+          ->infobar_manager();
   // Verify that there is only one infobar.
-  ASSERT_EQ(1u, infobar_service->infobar_count());
+  ASSERT_EQ(1u, infobar_manager.infobar_count());
 
   // Get the infobar at index 0.
-  InfoBar* infobar = infobar_service->infobar_at(0);
+  InfoBar* infobar = infobar_manager.infobar_at(0);
   ConfirmInfoBarDelegate* confirm_infobar =
       infobar->delegate()->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(confirm_infobar != NULL);
@@ -2807,9 +2810,9 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, TestMultipleDownloadsInfobar) {
 
   // Click on the "Allow" button to allow multiple downloads.
   if (confirm_infobar->Accept())
-    infobar_service->RemoveInfoBar(infobar);
+    infobar_manager.RemoveInfoBar(infobar);
   // Verify that there are no more infobars.
-  EXPECT_EQ(0u, infobar_service->infobar_count());
+  EXPECT_EQ(0u, infobar_manager.infobar_count());
 
   // Waits for the download to complete.
   downloads_observer->WaitForFinished();