Reflect device status in geolocation permissions.request calls.

chrome/browser/permissions/permission_manager.cc

Index: chrome/browser/permissions/permission_manager.cc
diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
index 3554494de2ce3bcee2d67350928704962bec582b..8b8ec66a6d4d814d36081552bcd618ca2e3c2f6d 100644
--- a/chrome/browser/permissions/permission_manager.cc
+++ b/chrome/browser/permissions/permission_manager.cc
@@ -440,10 +440,20 @@ PermissionStatus PermissionManager::GetPermissionStatus(
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

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

I think this may not work for MIDI anymore (need to add the constant permission
check). It's unfortunate that no tests picked up on this.

I think it would be better to call GetPermissionStatusHelper rather than
checking the context.

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

As discussed this should all be OK as is.

-  return ContentSettingToPermissionStatus(
+  PermissionResult result =
       GetPermissionStatus(PermissionTypeToContentSetting(permission),
-                          requesting_origin, embedding_origin)
-          .content_setting);
+                          requesting_origin, embedding_origin);
+
+  // TODO(benwells): split this into two functions, GetPermissionStatus and
+  // GetPermissionStatusForPermissionsAPI.
+  PermissionContextBase* context =
+      GetPermissionContext(PermissionTypeToContentSetting(permission));
+  if (context) {
+    result = context->UpdatePermissionStatusWithDeviceStatus(
+        result, requesting_origin, embedding_origin);
+  }
+
+  return ContentSettingToPermissionStatus(result.content_setting);
 }
 
 int PermissionManager::SubscribePermissionStatusChange(