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..e02eeda00e0c5bb49bba2b1a43c83c42920e0c58 100644
--- a/content/renderer/media/media_permission_dispatcher.cc
+++ b/content/renderer/media/media_permission_dispatcher.cc
@@ -16,17 +16,23 @@ 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;
     case Type::AUDIO_CAPTURE:
-      return blink::mojom::PermissionName::AUDIO_CAPTURE;
+      descriptor->name = blink::mojom::PermissionName::AUDIO_CAPTURE;
     case Type::VIDEO_CAPTURE:
-      return blink::mojom::PermissionName::VIDEO_CAPTURE;
+      descriptor->name = blink::mojom::PermissionName::VIDEO_CAPTURE;
+    default:
+      NOTREACHED();
+      descriptor->name =
+          blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;

[ddorwin, 2016/08/24 02:43:55]

As I note in the .mojom file, the member should probably be initialized to an
invalid value, which would be returned if we don't set the member here.

However, if the constructor is updated to take a name (see next file), then we
would need to provide something. In that case, the switch statement would simply
set a local variable that would then be used in the constructor. (This would
avoid the local descriptor variable.)

   }
-  NOTREACHED();
-  return blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
+  return descriptor;
 }
 
 }  // namespace
@@ -72,7 +78,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 +105,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));