Clean up geolocation code now that it's all upstream.

chrome/browser/android/location_settings_impl.cc

Index: chrome/browser/android/location_settings_impl.cc
diff --git a/chrome/browser/android/app_google_location_settings_helper.cc b/chrome/browser/android/location_settings_impl.cc
similarity index 62%
rename from chrome/browser/android/app_google_location_settings_helper.cc
rename to chrome/browser/android/location_settings_impl.cc
index 48226f576c71fd12e406a959b1068ec6799aff26..ab87ba90768c1f28bcbc3c8b176804e1ee22325e 100644
--- a/chrome/browser/android/app_google_location_settings_helper.cc
+++ b/chrome/browser/android/location_settings_impl.cc
@@ -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/android/app_google_location_settings_helper.h"
+#include "chrome/browser/android/location_settings_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ -12,21 +12,20 @@ using base::android::AttachCurrentThread;
 using base::android::CheckException;

[Michael van Ouwerkerk, 2015/01/19 12:03:14]

This is unused.

[newt (away), 2015/01/20 16:58:51]

Removed.

 using base::android::ScopedJavaLocalRef;

[Michael van Ouwerkerk, 2015/01/19 12:03:14]

This is unused.

[newt (away), 2015/01/20 16:58:51]

Removed.

 
-AppGoogleLocationSettingsHelper::AppGoogleLocationSettingsHelper()
-    : GoogleLocationSettingsHelper() {
+LocationSettingsImpl::LocationSettingsImpl()
+    : LocationSettings() {
 }
 
-AppGoogleLocationSettingsHelper::~AppGoogleLocationSettingsHelper() {
-}
+LocationSettingsImpl::~LocationSettingsImpl() {}
 
 // TODO(finnur): Rename this function IsLocationEnabled.
-bool AppGoogleLocationSettingsHelper::IsSystemLocationEnabled() {
+bool LocationSettingsImpl::IsSystemLocationEnabled() {
   JNIEnv* env = AttachCurrentThread();
   return Java_LocationSettings_areAllLocationSettingsEnabled(env);
 }
 
 // Register native methods
 
-bool AppGoogleLocationSettingsHelper::Register(JNIEnv* env) {
+bool LocationSettingsImpl::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }