Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/media/media_stream_infobar_delegate.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 "chrome/browser/media/media_stream_infobar_delegate.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/google/google_util.h"
@@ skipping 20 matching lines @@
       TabSpecificContentSettings::FromWebContents(web_contents);
   scoped_ptr<MediaStreamDevicesController> controller(
       new MediaStreamDevicesController(profile, content_settings,
                                        request, callback));
   if (controller->DismissInfoBarAndTakeActionOnSettings())
     return false;
 
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
   InfoBarDelegate* old_infobar = NULL;
-  for (size_t i = 0; i < infobar_service->GetInfoBarCount(); ++i) {
-    old_infobar = infobar_service->GetInfoBarDelegateAt(i)->
-        AsMediaStreamInfoBarDelegate();
+  for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
+    old_infobar =
+        infobar_service->infobar_at(i)->AsMediaStreamInfoBarDelegate();
     if (old_infobar)
       break;
   }
   scoped_ptr<InfoBarDelegate> infobar(
       new MediaStreamInfoBarDelegate(infobar_service, controller.release()));
   if (old_infobar)
     infobar_service->ReplaceInfoBar(old_infobar, infobar.Pass());
   else
     infobar_service->AddInfoBar(infobar.Pass());
 
@@ skipping 53 matching lines @@
 
 bool MediaStreamInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
   content::OpenURLParams params(
       google_util::AppendGoogleLocaleParam(
           GURL(chrome::kMediaAccessLearnMoreUrl)),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK,
       false);
-  owner()->GetWebContents()->OpenURL(params);
+  owner()->web_contents()->OpenURL(params);
 
   return false;  // Do not dismiss the info bar.
 }
 
 MediaStreamInfoBarDelegate::MediaStreamInfoBarDelegate(
     InfoBarService* infobar_service,
     MediaStreamDevicesController* controller)
     : ConfirmInfoBarDelegate(infobar_service),
       controller_(controller) {
   DCHECK(controller_.get());
   DCHECK(controller_->has_audio() || controller_->has_video());
 }