GeolocationConfirmInfoBarDelegate* -> GeolocationInfoBarDelegate*, for consistency with other infob…

chrome/browser/geolocation/geolocation_infobar_delegate_android.cc

Index: chrome/browser/geolocation/geolocation_infobar_delegate_android.cc
===================================================================
--- chrome/browser/geolocation/geolocation_infobar_delegate_android.cc	(working copy)
+++ chrome/browser/geolocation/geolocation_infobar_delegate_android.cc	(working copy)
@@ -2,7 +2,7 @@
 // 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_confirm_infobar_delegate_android.h"
+#include "chrome/browser/geolocation/geolocation_infobar_delegate_android.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/android/google_location_settings_helper.h"
@@ -11,29 +11,26 @@
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-GeolocationConfirmInfoBarDelegateAndroid::
-    GeolocationConfirmInfoBarDelegateAndroid(
+GeolocationInfoBarDelegateAndroid::GeolocationInfoBarDelegateAndroid(
     InfoBarService* infobar_service,
     GeolocationInfoBarQueueController* controller,
     const GeolocationPermissionRequestID& id,
     const GURL& requesting_frame_url,
     const std::string& display_languages)
-    : GeolocationConfirmInfoBarDelegate(infobar_service, controller, id,
-                                        requesting_frame_url,
-                                        display_languages),
+    : GeolocationInfoBarDelegate(infobar_service, controller, id,
+                                 requesting_frame_url, display_languages),
       google_location_settings_helper_(
           GoogleLocationSettingsHelper::Create()) {
 }
 
-GeolocationConfirmInfoBarDelegateAndroid::
-    ~GeolocationConfirmInfoBarDelegateAndroid() {
+GeolocationInfoBarDelegateAndroid::~GeolocationInfoBarDelegateAndroid() {
 }
 
-bool GeolocationConfirmInfoBarDelegateAndroid::Accept() {
+bool GeolocationInfoBarDelegateAndroid::Accept() {
   // Accept button text could be either 'Allow' or 'Google Location Settings'.
   // If 'Allow' we follow the regular flow.
   if (google_location_settings_helper_->IsGoogleAppsLocationSettingEnabled())
-    return GeolocationConfirmInfoBarDelegate::Accept();
+    return GeolocationInfoBarDelegate::Accept();
 
   // If 'Google Location Settings', we need to open the system Google Location
   // Settings activity.
@@ -42,7 +39,7 @@
   return true;
 }
 
-string16 GeolocationConfirmInfoBarDelegateAndroid::GetButtonLabel(
+string16 GeolocationInfoBarDelegateAndroid::GetButtonLabel(
     InfoBarButton button) const {
   if (button == BUTTON_OK) {
     return UTF8ToUTF16(