Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/geolocation/geolocation_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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 565 matching lines @@
   // Disables further prompts from this iframe.
   CheckStringValueFromJavascript("0", "geoSetMaxNavigateCount(0)");
 
   // Test second iframe from a different origin with a cached geoposition will
   // create the infobar.
   iframe_xpath_ = "//iframe[@id='iframe_1']";
   AddGeolocationWatch(true);
 
   InfoBarService* infobar_service = InfoBarService::FromWebContents(
       current_browser_->tab_strip_model()->GetActiveWebContents());
-  size_t num_infobars_before_cancel = infobar_service->GetInfoBarCount();
+  size_t num_infobars_before_cancel = infobar_service->infobar_count();
   // Change the iframe, and ensure the infobar is gone.
   IFrameLoader change_iframe_1(current_browser_, 1, current_url_);
-  size_t num_infobars_after_cancel = infobar_service->GetInfoBarCount();
+  size_t num_infobars_after_cancel = infobar_service->infobar_count();
   EXPECT_EQ(num_infobars_before_cancel, num_infobars_after_cancel + 1);
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, InvalidUrlRequest) {
   // Tests that an invalid URL (e.g. from a popup window) is rejected
   // correctly. Also acts as a regression test for http://crbug.com/40478
   html_for_tests_ = "files/geolocation/invalid_request_url.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
   WebContents* original_tab =
       current_browser_->tab_strip_model()->GetActiveWebContents();
@@ skipping 76 matching lines @@
   std::string script =
       "window.domAutomationController.send(window.close());";
   bool result =
       content::ExecuteScript(
           current_browser_->tab_strip_model()->GetActiveWebContents(),
           script);
   EXPECT_EQ(result, true);
 }
 
 }  // namespace