Simplify Android geolocation permission checks

chrome/browser/android/google_location_settings_helper.cc

Index: chrome/browser/android/google_location_settings_helper.cc
diff --git a/chrome/browser/android/google_location_settings_helper.cc b/chrome/browser/android/google_location_settings_helper.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3dc8e004a75ea604f61b6942d695f27277fc0b2a
--- /dev/null
+++ b/chrome/browser/android/google_location_settings_helper.cc
@@ -0,0 +1,31 @@
+// Copyright 2014 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/android/google_location_settings_helper.h"
+
+// Temporary stubs for a 3 way patch
+
+std::string GoogleLocationSettingsHelper::GetAcceptButtonLabel(bool allow) {
+  return std::string();
+}
+
+bool GoogleLocationSettingsHelper::IsAllowLabel() {
+  return false;
+}
+
+void GoogleLocationSettingsHelper::ShowGoogleLocationSettings() {
+}
+
+bool GoogleLocationSettingsHelper::IsMasterLocationSettingEnabled() {
+  return false;
+}
+
+bool GoogleLocationSettingsHelper::IsGoogleAppsLocationSettingEnabled() {
+  return false;
+}
+
+bool GoogleLocationSettingsHelper::IsSystemLocationEnabled() {
+  return IsMasterLocationSettingEnabled() &&
+      IsGoogleAppsLocationSettingEnabled();
+}