Reflect device status in geolocation permissions.request calls.

chrome/browser/geolocation/geolocation_permission_context_android.h

Index: chrome/browser/geolocation/geolocation_permission_context_android.h
diff --git a/chrome/browser/geolocation/geolocation_permission_context_android.h b/chrome/browser/geolocation/geolocation_permission_context_android.h
index 3b89e421be05d644a90866532f934865fc0e8fb5..9df171370b7d335f9d5fa771adf72d1b754398d2 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_android.h
+++ b/chrome/browser/geolocation/geolocation_permission_context_android.h
@@ -71,13 +71,17 @@ class GeolocationPermissionContextAndroid
                            const BrowserPermissionCallback& callback,
                            bool persist,
                            ContentSetting content_setting) override;
+  PermissionResult UpdatePermissionStatusWithDeviceStatus(

[raymes, 2017/03/10 02:53:31]

Something for future thought: I wonder if this would be better as just returning
the device permission status directly and then we combine them at the higher
layer, e.g. PermissionManager. I think we may end up duplicating logic for
combining them across permissions.

[benwells, 2017/03/10 04:19:19]

Acknowledged.

+      PermissionResult result,
+      const GURL& requesting_origin,
+      const GURL& embedding_origin) const override;
 
   bool IsLocationAccessPossible(content::WebContents* web_contents,
                                 const GURL& requesting_origin,
                                 bool user_gesture);
 
   LocationSettingsDialogContext GetLocationSettingsDialogContext(
-      const GURL& requesting_origin);
+      const GURL& requesting_origin) const;
 
   void HandleUpdateAndroidPermissions(const PermissionRequestID& id,
                                       const GURL& requesting_frame_origin,
@@ -90,7 +94,7 @@ class GeolocationPermissionContextAndroid
   // be shown, any gesture requirements for the origin are met, and the dialog
   // is not being suppressed for backoff.
   bool CanShowLocationSettingsDialog(const GURL& requesting_origin,
-                                     bool user_gesture);
+                                     bool user_gesture) const;
 
   void OnLocationSettingsDialogShown(
       const PermissionRequestID& id,