Add PermissionDescriptor to the permissions Mojo interface.

content/renderer/media/media_permission_dispatcher.cc

Index: content/renderer/media/media_permission_dispatcher.cc
diff --git a/content/renderer/media/media_permission_dispatcher.cc b/content/renderer/media/media_permission_dispatcher.cc
index ec27bb58a820f3e0399b43336628364e42e99a7f..ccd7591ff69b8e6d9861ce3c1da6b4b800b41635 100644
--- a/content/renderer/media/media_permission_dispatcher.cc
+++ b/content/renderer/media/media_permission_dispatcher.cc
@@ -16,17 +16,26 @@ namespace {
 
 using Type = media::MediaPermission::Type;
 
-blink::mojom::PermissionName MediaPermissionTypeToPermissionName(Type type) {
+blink::mojom::PermissionDescriptorPtr MediaPermissionTypeToPermissionDescriptor(
+    Type type) {
+  auto descriptor = blink::mojom::PermissionDescriptor::New();
   switch (type) {
     case Type::PROTECTED_MEDIA_IDENTIFIER:
-      return blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
+      descriptor->name =
+          blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
+      break;
     case Type::AUDIO_CAPTURE:
-      return blink::mojom::PermissionName::AUDIO_CAPTURE;
+      descriptor->name = blink::mojom::PermissionName::AUDIO_CAPTURE;
+      break;
     case Type::VIDEO_CAPTURE:
-      return blink::mojom::PermissionName::VIDEO_CAPTURE;
+      descriptor->name = blink::mojom::PermissionName::VIDEO_CAPTURE;
+      break;
+    default:
+      NOTREACHED() << type;
+      descriptor->name =
+          blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
   }
-  NOTREACHED();
-  return blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
+  return descriptor;
 }
 
 }  // namespace
@@ -72,7 +81,8 @@ void MediaPermissionDispatcher::HasPermission(
   DVLOG(2) << __func__ << ": request ID " << request_id;
 
   permission_service_->HasPermission(
-      MediaPermissionTypeToPermissionName(type), url::Origin(security_origin),
+      MediaPermissionTypeToPermissionDescriptor(type),
+      url::Origin(security_origin),
       base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, weak_ptr_,
                  request_id));
 }
@@ -98,7 +108,8 @@ void MediaPermissionDispatcher::RequestPermission(
   DVLOG(2) << __func__ << ": request ID " << request_id;
 
   permission_service_->RequestPermission(
-      MediaPermissionTypeToPermissionName(type), url::Origin(security_origin),
+      MediaPermissionTypeToPermissionDescriptor(type),
+      url::Origin(security_origin),
       blink::WebUserGestureIndicator::isProcessingUserGesture(),
       base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, weak_ptr_,
                  request_id));