Show the Android Location Settings Dialog when sites want permission.

chrome/browser/android/mock_location_settings.h

Index: chrome/browser/android/mock_location_settings.h
diff --git a/chrome/browser/android/mock_location_settings.h b/chrome/browser/android/mock_location_settings.h
index 2089555d2f34ee1c1cbb32055f1d64387eb18831..2dea58d7c79c2c0a100dc7511cdb57018f9e10b4 100644
--- a/chrome/browser/android/mock_location_settings.h
+++ b/chrome/browser/android/mock_location_settings.h
@@ -14,25 +14,32 @@ class MockLocationSettings : public LocationSettings {
   MockLocationSettings();
   ~MockLocationSettings() override;
 
-  static void SetLocationStatus(bool master, bool google_apps);
-
-  bool CanSitesRequestLocationPermission(
+  static void SetLocationStatus(bool android, bool system);

[dominickn, 2017/03/03 00:08:23]

Nit: can this be has_android_permission and system_geolocation_enabled?

[benwells, 2017/03/03 01:43:09]

Done.

+  static void SetCanPromptForAndroidPermission(bool can_prompt);
+  static void SetLocationSettingsDialogStatus(
+      bool enabled,
+      LocationSettingsDialogOutcome outcome);
+  static bool HasShownLocationSettingsDialog();
+
+  // LocationSettings implementation:
+  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,
       LocationSettingsDialogOutcomeCallback callback)
       override;
 
-  bool IsMasterLocationSettingEnabled();
-  bool IsGoogleAppsLocationSettingEnabled();
-
  private:
-  static bool master_location_enabled;
-  static bool google_apps_location_enabled;
+  static bool has_android_location_permission;
+  static bool can_prompt_for_android_location_permission;
+  static bool is_system_location_setting_enabled;
+  static bool location_settings_dialog_enabled;
+  static bool has_shown_location_settings_dialog;
+  static LocationSettingsDialogOutcome location_settings_dialog_outcome;
 
   DISALLOW_COPY_AND_ASSIGN(MockLocationSettings);
 };