Rebase and some more stuff

chrome/browser/android/location_settings_impl.h

Index: chrome/browser/android/location_settings_impl.h
diff --git a/chrome/browser/android/location_settings_impl.h b/chrome/browser/android/location_settings_impl.h
index a48db5fa4a9b253295c71b75c43ba56414ed4c7e..c4e49283a720afc89840c016a3a38dd6a1a574e7 100644
--- a/chrome/browser/android/location_settings_impl.h
+++ b/chrome/browser/android/location_settings_impl.h
@@ -18,11 +18,11 @@ class LocationSettingsImpl : public LocationSettings {
   ~LocationSettingsImpl() override;
 
   // LocationSettings implementation:
-  bool CanSitesRequestLocationPermission(
+  bool HasAndroidLocationPermission() override;
+  bool CanPromptForAndroidLocationPermission(
       content::WebContents* web_contents) override;
-
+  bool IsSystemLocationSettingEnabled() override;
   bool CanPromptToEnableSystemLocationSetting() override;
-
   void PromptToEnableSystemLocationSetting(
       const LocationSettingsDialogContext prompt_context,
       content::WebContents* web_contents,