Move infobar handling to a tab helper.

chrome/browser/geolocation/chrome_geolocation_permission_context.cc

Index: chrome/browser/geolocation/chrome_geolocation_permission_context.cc
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
index d41be1c70216a19a807a09f485dc8a43e5211479..fc7af065f0cf80ee250a035cf7e14642f5ed3e8a 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/google/google_util.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
@@ -465,7 +466,7 @@ void GeolocationInfoBarQueueController::ShowQueuedInfoBar(int render_process_id,
             tab_contents, this, render_process_id, render_view_id, i->bridge_id,
             i->requesting_frame,
             profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
-        wrapper->AddInfoBar(i->infobar_delegate);
+        wrapper->infobar_tab_helper()->AddInfoBar(i->infobar_delegate);
       }
       break;
     }
@@ -489,7 +490,7 @@ GeolocationInfoBarQueueController::PendingInfoBarRequests::iterator
   // asynchronously.
   TabContentsWrapper* wrapper =

[Peter Kasting, 2011/08/31 18:47:32]

Nit: Just combine these two lines

       TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);
-  wrapper->RemoveInfoBar(i->infobar_delegate);
+  wrapper->infobar_tab_helper()->RemoveInfoBar(i->infobar_delegate);
   return ++i;
 }