Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/download/download_browsertest.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 <sstream>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 2663 matching lines @@
         chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
         content::NotificationService::AllSources());
   ui_test_utils::NavigateToURL(
      browser(),
      test_server()->GetURL("files/downloads/download-a_zip_file.html"));
   infobar_added_1.Wait();
 
   InfoBarService* infobar_service = InfoBarService::FromWebContents(
        browser()->tab_strip_model()->GetActiveWebContents());
   // Verify that there is only one infobar.
-  EXPECT_EQ(1u, infobar_service->GetInfoBarCount());
+  ASSERT_EQ(1u, infobar_service->infobar_count());
 
   // Get the infobar at index 0.
-  int infobar_index = 0;
-  InfoBarDelegate* infobar =
-      infobar_service->GetInfoBarDelegateAt(infobar_index);
-  EXPECT_TRUE(infobar != NULL);
+  InfoBarDelegate* infobar = infobar_service->infobar_at(0);
+  ASSERT_TRUE(infobar != NULL);
 
-  ConfirmInfoBarDelegate* confirm_infobar =
-      infobar->AsConfirmInfoBarDelegate();
-  EXPECT_TRUE(confirm_infobar != NULL);
+  ConfirmInfoBarDelegate* confirm_infobar = infobar->AsConfirmInfoBarDelegate();
+  ASSERT_TRUE(confirm_infobar != NULL);
 
   // Verify multi download warning infobar message.
   EXPECT_EQ(confirm_infobar->GetMessageText(),
             l10n_util::GetStringUTF16(IDS_MULTI_DOWNLOAD_WARNING));
 
   // Click on the "Allow" button to allow multiple downloads.
   if (confirm_infobar->Accept())
     infobar_service->RemoveInfoBar(infobar);
   // Verify that there are no more infobars.
-  EXPECT_EQ(0u, infobar_service->GetInfoBarCount());
+  EXPECT_EQ(0u, infobar_service->infobar_count());
 
   // Waits for the download to complete.
   downloads_observer->WaitForFinished();
   EXPECT_EQ(2u, downloads_observer->NumDownloadsSeenInState(
       DownloadItem::COMPLETE));
 }
 
 IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadTest_Renaming) {
   ASSERT_TRUE(test_server()->Start());
   GURL url(test_server()->GetURL("files/downloads/a_zip_file.zip"));
@@ skipping 212 matching lines @@
   scoped_ptr<content::DownloadTestObserver> observer(
       DangerousDownloadWaiter(
           browser(), 1,
           content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_DENY));
   ui_test_utils::NavigateToURL(browser(), url);
   observer->WaitForFinished();
   EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::CANCELLED));
   EXPECT_EQ(1u, observer->NumDangerousDownloadsSeen());
   EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
 }