Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/test/gpu/webgl_infobar_browsertest.cc

Index: chrome/test/gpu/webgl_infobar_browsertest.cc
===================================================================
--- chrome/test/gpu/webgl_infobar_browsertest.cc	(revision 195254)
+++ chrome/test/gpu/webgl_infobar_browsertest.cc	(working copy)
@@ -87,7 +87,7 @@
   EXPECT_EQ(1u,
             InfoBarService::FromWebContents(
                 browser()->tab_strip_model()->GetActiveWebContents())->
-                    GetInfoBarCount());
+                    infobar_count());
 }
 
 IN_PROC_BROWSER_TEST_F(WebGLInfobarTest, ContextLossInfobarReload) {
@@ -118,13 +118,10 @@
         content::NotificationService::AllSources());
   SimulateGPUCrash(browser());
   infobar_added.Wait();
-  EXPECT_EQ(1u,
-            InfoBarService::FromWebContents(
-                browser()->tab_strip_model()->GetActiveWebContents())->
-                    GetInfoBarCount());
-  InfoBarDelegate* delegate = InfoBarService::FromWebContents(
-      browser()->tab_strip_model()->GetActiveWebContents())->
-          GetInfoBarDelegateAt(0);
+  InfoBarService* infobar_service = InfoBarService::FromWebContents(
+      browser()->tab_strip_model()->GetActiveWebContents());
+  EXPECT_EQ(1u, infobar_service->infobar_count());
+  InfoBarDelegate* delegate = infobar_service->infobar_at(0);
   ASSERT_TRUE(delegate);
   ASSERT_TRUE(delegate->AsThreeDAPIInfoBarDelegate());
   delegate->AsConfirmInfoBarDelegate()->Cancel();