Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/geolocation/geolocation_infobar_delegate_android.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/geolocation/geolocation_infobar_delegate_android.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/google_location_settings_helper.h"
 #include "grit/generated_resources.h"
@@ skipping 17 matching lines @@
   GEOLOCATION_INFO_BAR_DELEGATE_ANDROID_EVENT_COUNT = 2
 };
 
 void RecordUmaEvent(GeolocationInfoBarDelegateAndroidEvent event) {
   UMA_HISTOGRAM_ENUMERATION("Geolocation.InfoBarDelegateAndroid.Event",
       event, GEOLOCATION_INFO_BAR_DELEGATE_ANDROID_EVENT_COUNT);
 }
 }  // namespace
 
 GeolocationInfoBarDelegateAndroid::GeolocationInfoBarDelegateAndroid(
+    InfoBarService* infobar_service,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame_url,
     int contents_unique_id,
     const std::string& display_languages)
-    : GeolocationInfoBarDelegate(controller, id, requesting_frame_url,
-                                 contents_unique_id, display_languages),
+    : GeolocationInfoBarDelegate(infobar_service, controller, id,
+                                 requesting_frame_url, contents_unique_id,
+                                 display_languages),
       google_location_settings_helper_(
           GoogleLocationSettingsHelper::Create()) {
 }
 
 GeolocationInfoBarDelegateAndroid::~GeolocationInfoBarDelegateAndroid() {
 }
 
 bool GeolocationInfoBarDelegateAndroid::Accept() {
   set_user_has_interacted();
 
@@ skipping 11 matching lines @@
   SetPermission(false, false);
   return true;
 }
 
 string16 GeolocationInfoBarDelegateAndroid::GetButtonLabel(
     InfoBarButton button) const {
   return (button == BUTTON_OK) ?
       UTF8ToUTF16(google_location_settings_helper_->GetAcceptButtonLabel()) :
       l10n_util::GetStringUTF16(IDS_GEOLOCATION_DENY_BUTTON);
 }