Reflect device status in geolocation permissions.request calls.

chrome/browser/geolocation/geolocation_permission_context_android.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_
 #define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_
 
 // The flow for geolocation permissions on Android needs to take into account
 // the global geolocation settings so it differs from the desktop one. It
 // works as follows.
@@ skipping 53 matching lines @@
       bool user_gesture,
       const BrowserPermissionCallback& callback) override;
   void CancelPermissionRequest(content::WebContents* web_contents,
                                const PermissionRequestID& id) override;
   void NotifyPermissionSet(const PermissionRequestID& id,
                            const GURL& requesting_origin,
                            const GURL& embedding_origin,
                            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,
                                       const GURL& embedding_origin,
                                       const BrowserPermissionCallback& callback,
                                       bool permissions_updated);
 
   // Will return true if the location settings dialog will be shown for the
   // given origins. This is true if the location setting is off, the dialog can
   // 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,
       const GURL& requesting_origin,
       const GURL& embedding_origin,
       const BrowserPermissionCallback& callback,
       bool persist,
       ContentSetting content_setting,
       LocationSettingsDialogOutcome prompt_outcome);
 
@@ skipping 15 matching lines @@
   infobars::InfoBar* permission_update_infobar_;
 
   // Must be the last member, to ensure that it will be destroyed first, which
   // will invalidate weak pointers.
   base::WeakPtrFactory<GeolocationPermissionContextAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GeolocationPermissionContextAndroid);
 };
 
 #endif  // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_