Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/geolocation/geolocation_infobar_delegate.cc

Index: chrome/browser/geolocation/geolocation_infobar_delegate.cc
===================================================================
--- chrome/browser/geolocation/geolocation_infobar_delegate.cc	(revision 195254)
+++ chrome/browser/geolocation/geolocation_infobar_delegate.cc	(working copy)
@@ -49,7 +49,7 @@
       requesting_frame_(requesting_frame),
       display_languages_(display_languages) {
   const content::NavigationEntry* committed_entry = infobar_service->
-      GetWebContents()->GetController().GetLastCommittedEntry();
+      web_contents()->GetController().GetLastCommittedEntry();
    contents_unique_id_ = committed_entry ? committed_entry->GetUniqueID() : 0;
 }
 
@@ -87,7 +87,7 @@
 void GeolocationInfoBarDelegate::SetPermission(bool update_content_setting,
                                                bool allowed) {
   controller_->OnPermissionSet(id_, requesting_frame_,
-                               owner()->GetWebContents()->GetURL(),
+                               owner()->web_contents()->GetURL(),
                                update_content_setting, allowed);
 }
 
@@ -119,6 +119,6 @@
       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.
 }