Rebase and some more stuff

chrome/browser/android/location_settings_impl.cc

Index: chrome/browser/android/location_settings_impl.cc
diff --git a/chrome/browser/android/location_settings_impl.cc b/chrome/browser/android/location_settings_impl.cc
index 5ddf275d05e1972ca58c1b96e026bcc6dc6fce81..63595afb99d0812ab62fc13e240f94fbc6d97e5a 100644
--- a/chrome/browser/android/location_settings_impl.cc
+++ b/chrome/browser/android/location_settings_impl.cc
@@ -17,13 +17,23 @@ LocationSettingsImpl::LocationSettingsImpl() {}
 
 LocationSettingsImpl::~LocationSettingsImpl() {}
 
-bool LocationSettingsImpl::CanSitesRequestLocationPermission(
+bool LocationSettingsImpl::HasAndroidLocationPermission() {
+  JNIEnv* env = AttachCurrentThread();
+  return Java_LocationSettings_hasAndroidLocationPermission(env);
+}
+
+bool LocationSettingsImpl::CanPromptForAndroidLocationPermission(
     content::WebContents* web_contents) {
   JNIEnv* env = AttachCurrentThread();
-  return Java_LocationSettings_canSitesRequestLocationPermission(
+  return Java_LocationSettings_canPromptForAndroidLocationPermission(
       env, web_contents->GetJavaWebContents());
 }
 
+bool LocationSettingsImpl::IsSystemLocationSettingEnabled() {
+  JNIEnv* env = AttachCurrentThread();
+  return Java_LocationSettings_isSystemLocationSettingEnabled(env);
+}
+
 bool LocationSettingsImpl::CanPromptToEnableSystemLocationSetting() {
   JNIEnv* env = AttachCurrentThread();
   return Java_LocationSettings_canPromptToEnableSystemLocationSetting(env);