Add PermissionDescriptor to the permissions Mojo interface.

content/renderer/media/media_permission_dispatcher.cc

 // Copyright 2015 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.
 
 #include "content/renderer/media/media_permission_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/base/bind_to_current_loop.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 #include "url/gurl.h"
 
 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
 
 namespace content {
 
 MediaPermissionDispatcher::MediaPermissionDispatcher(
     const ConnectToServiceCB& connect_to_service_cb)
     : connect_to_service_cb_(connect_to_service_cb),
       task_runner_(base::ThreadTaskRunnerHandle::Get()),
@@ skipping 25 matching lines @@
 
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   if (!permission_service_)
     connect_to_service_cb_.Run(mojo::GetProxy(&permission_service_));
 
   int request_id = RegisterCallback(permission_status_cb);
   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));
 }
 
 void MediaPermissionDispatcher::RequestPermission(
     Type type,
     const GURL& security_origin,
     const PermissionStatusCB& permission_status_cb) {
   if (!task_runner_->RunsTasksOnCurrentThread()) {
     task_runner_->PostTask(
         FROM_HERE, base::Bind(&MediaPermissionDispatcher::RequestPermission,
                               weak_ptr_, type, security_origin,
                               media::BindToCurrentLoop(permission_status_cb)));
     return;
   }
 
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   if (!permission_service_)
     connect_to_service_cb_.Run(mojo::GetProxy(&permission_service_));
 
   int request_id = RegisterCallback(permission_status_cb);
   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));
 }
 
 uint32_t MediaPermissionDispatcher::RegisterCallback(
     const PermissionStatusCB& permission_status_cb) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   uint32_t request_id = next_request_id_++;
@@ skipping 12 matching lines @@
   RequestMap::iterator iter = requests_.find(request_id);
   DCHECK(iter != requests_.end()) << "Request not found.";
 
   PermissionStatusCB permission_status_cb = iter->second;
   requests_.erase(iter);
 
   permission_status_cb.Run(status == blink::mojom::PermissionStatus::GRANTED);
 }
 
 }  // namespace content