Add PermissionDescriptor to the permissions Mojo interface.

content/browser/permissions/permission_service_impl.h

 // Copyright 2014 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 CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_
 #define CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_
 
 #include "base/callback.h"
 #include "base/id_map.h"
 #include "base/macros.h"
@@ skipping 54 matching lines @@
 
     // Subscription ID received from the PermissionManager.
     int id;
     PermissionType permission;
     url::Origin origin;
     PermissionStatusCallback callback;
   };
   using SubscriptionsMap = IDMap<PendingSubscription, IDMapOwnPointer>;
 
   // blink::mojom::PermissionService.
-  void HasPermission(blink::mojom::PermissionName permission,
+  void HasPermission(blink::mojom::PermissionDescriptorPtr permission,
                      const url::Origin& origin,
                      const PermissionStatusCallback& callback) override;
-  void RequestPermission(blink::mojom::PermissionName permission,
+  void RequestPermission(blink::mojom::PermissionDescriptorPtr permission,
                          const url::Origin& origin,
                          bool user_gesture,
                          const PermissionStatusCallback& callback) override;
   void RequestPermissions(
-      const std::vector<blink::mojom::PermissionName>& permissions,
+      std::vector<blink::mojom::PermissionDescriptorPtr> permissions,
       const url::Origin& origin,
       bool user_gesture,
       const RequestPermissionsCallback& callback) override;
-  void RevokePermission(blink::mojom::PermissionName permission,
+  void RevokePermission(blink::mojom::PermissionDescriptorPtr permission,
                         const url::Origin& origin,
                         const PermissionStatusCallback& callback) override;
   void GetNextPermissionChange(
-      blink::mojom::PermissionName permission,
+      blink::mojom::PermissionDescriptorPtr permission,
       const url::Origin& origin,
       blink::mojom::PermissionStatus last_known_status,
       const PermissionStatusCallback& callback) override;
 
   void OnConnectionError();
 
   void OnRequestPermissionResponse(int pending_request_id,
                                    blink::mojom::PermissionStatus status);
   void OnRequestPermissionsResponse(
       int pending_request_id,
       const std::vector<blink::mojom::PermissionStatus>& result);
 
-  blink::mojom::PermissionStatus GetPermissionStatusFromName(
-      blink::mojom::PermissionName permission,
+  blink::mojom::PermissionStatus GetPermissionStatus(
+      const blink::mojom::PermissionDescriptorPtr& permission,
       const url::Origin& origin);
   blink::mojom::PermissionStatus GetPermissionStatusFromType(
       PermissionType type,
       const url::Origin& origin);
   void ResetPermissionStatus(PermissionType type, const url::Origin& origin);
 
   void OnPermissionStatusChanged(int pending_subscription_id,
                                  blink::mojom::PermissionStatus status);
 
   RequestsMap pending_requests_;
   SubscriptionsMap pending_subscriptions_;
   // context_ owns |this|.
   PermissionServiceContext* context_;
   mojo::Binding<blink::mojom::PermissionService> binding_;
   base::WeakPtrFactory<PermissionServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_