Simplify Android geolocation permission checks

chrome/browser/geolocation/geolocation_infobar_delegate.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 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.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(OS_ANDROID)
-#include "chrome/browser/geolocation/geolocation_infobar_delegate_android.h"
-typedef GeolocationInfoBarDelegateAndroid DelegateType;
-#else
-typedef GeolocationInfoBarDelegate DelegateType;
-#endif
 
 namespace {
 
 enum GeolocationInfoBarDelegateEvent {
   // NOTE: Do not renumber these as that would confuse interpretation of
   // previously logged data. When making changes, also update the enum list
   // in tools/metrics/histograms/histograms.xml to keep it in sync.
 
   // The bar was created.
   GEOLOCATION_INFO_BAR_DELEGATE_EVENT_CREATE = 0,
@@ skipping 23 matching lines @@
 }
 
 }  // namespace
 
 // static
 infobars::InfoBar* GeolocationInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
-    const std::string& display_languages,
-    const std::string& accept_button_label) {
+    const std::string& display_languages) {
   RecordUmaEvent(GEOLOCATION_INFO_BAR_DELEGATE_EVENT_CREATE);
   const content::NavigationEntry* committed_entry =
       infobar_service->web_contents()->GetController().GetLastCommittedEntry();
-  GeolocationInfoBarDelegate* const delegate = new DelegateType(
+  GeolocationInfoBarDelegate* const delegate = new GeolocationInfoBarDelegate(
           controller, id, requesting_frame,
           committed_entry ? committed_entry->GetUniqueID() : 0,
-          display_languages, accept_button_label);
+          display_languages);
 
   infobars::InfoBar* infobar = ConfirmInfoBarDelegate::CreateInfoBar(
       scoped_ptr<ConfirmInfoBarDelegate>(delegate)).release();
   return infobar_service->AddInfoBar(scoped_ptr<infobars::InfoBar>(infobar));
 }
 
 GeolocationInfoBarDelegate::GeolocationInfoBarDelegate(
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     int contents_unique_id,
-    const std::string& display_languages,
-    const std::string& accept_button_label)
+    const std::string& display_languages)
     : ConfirmInfoBarDelegate(),
       controller_(controller),
       id_(id),
       requesting_frame_(requesting_frame.GetOrigin()),
       contents_unique_id_(contents_unique_id),
       display_languages_(display_languages),
       user_has_interacted_(false) {
 }
 
 GeolocationInfoBarDelegate::~GeolocationInfoBarDelegate() {
@@ skipping 54 matching lines @@
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
       IDS_GEOLOCATION_ALLOW_BUTTON : IDS_GEOLOCATION_DENY_BUTTON);
 }
 
 bool GeolocationInfoBarDelegate::Cancel() {
   RecordUmaEvent(GEOLOCATION_INFO_BAR_DELEGATE_EVENT_DENY);
   set_user_has_interacted();
   SetPermission(true, false);
   return true;
 }