| 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..0d87cf36acc09ff191ea9d30fc1e9cf5a528fa73 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.
|
|
|
| @@ -27,14 +27,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;
|
| }
|
| @@ -46,7 +38,3 @@ bool MockGoogleLocationSettingsHelper::IsMasterLocationSettingEnabled() {
|
| bool MockGoogleLocationSettingsHelper::WasGoogleLocationSettingsCalled() {
|
| return was_google_location_settings_called;
|
| }
|
| -
|
| -bool MockGoogleLocationSettingsHelper::IsAllowLabel() {
|
| - return google_apps_location_enabled;
|
| -}
|
|
|