Simplify Android geolocation permission checks

chrome/browser/android/mock_google_location_settings_helper.cc

Index: chrome/browser/android/mock_google_location_settings_helper.cc
diff --git a/chrome/browser/android/mock_google_location_settings_helper.cc b/chrome/browser/android/mock_google_location_settings_helper.cc
index 8dc77678dae9ef52004845743d26e968882c884d..ce8be12a72b153f8d3e3f9070713bd42198df054 100644
--- a/chrome/browser/android/mock_google_location_settings_helper.cc
+++ b/chrome/browser/android/mock_google_location_settings_helper.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -6,8 +6,6 @@
 
 bool MockGoogleLocationSettingsHelper::master_location_enabled = false;
 bool MockGoogleLocationSettingsHelper::google_apps_location_enabled = false;
-bool MockGoogleLocationSettingsHelper::was_google_location_settings_called
-    = false;
 
 // Factory function
 GoogleLocationSettingsHelper* GoogleLocationSettingsHelper::Create() {
@@ -27,14 +25,6 @@ void MockGoogleLocationSettingsHelper::SetLocationStatus(
   google_apps_location_enabled = google_apps;
 }
 
-std::string MockGoogleLocationSettingsHelper::GetAcceptButtonLabel(bool allow) {
-  return IsAllowLabel() ? "Allow" : "Settings";
-}
-
-void MockGoogleLocationSettingsHelper::ShowGoogleLocationSettings() {
-  was_google_location_settings_called = true;
-}
-
 bool MockGoogleLocationSettingsHelper::IsGoogleAppsLocationSettingEnabled() {
   return google_apps_location_enabled;
 }
@@ -42,11 +32,3 @@ bool MockGoogleLocationSettingsHelper::IsGoogleAppsLocationSettingEnabled() {
 bool MockGoogleLocationSettingsHelper::IsMasterLocationSettingEnabled() {
   return master_location_enabled;
 }
-
-bool MockGoogleLocationSettingsHelper::WasGoogleLocationSettingsCalled() {
-  return was_google_location_settings_called;
-}
-
-bool MockGoogleLocationSettingsHelper::IsAllowLabel() {
-  return google_apps_location_enabled;
-}