Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/media/media_stream_infobar_delegate.cc

Index: chrome/browser/media/media_stream_infobar_delegate.cc
===================================================================
--- chrome/browser/media/media_stream_infobar_delegate.cc	(revision 195254)
+++ chrome/browser/media/media_stream_infobar_delegate.cc	(working copy)
@@ -38,9 +38,9 @@
   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;
   }
@@ -114,7 +114,7 @@
       (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.
 }