Add PermissionDescriptor to the permissions Mojo interface.

third_party/WebKit/Source/modules/notifications/NotificationManager.cpp

 // Copyright 2016 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 "modules/notifications/NotificationManager.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "modules/notifications/Notification.h"
 #include "modules/notifications/NotificationPermissionCallback.h"
-#include "modules/permissions/Permissions.h"
+#include "modules/permissions/PermissionUtils.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/Platform.h"
 #include "public/platform/modules/permissions/permission.mojom-blink.h"
 #include "public/platform/modules/permissions/permission_status.mojom-blink.h"
 #include "wtf/Functional.h"
 
 namespace blink {
 
@@ skipping 37 matching lines @@
     DCHECK(result);
 
     return permissionStatus;
 }
 
 ScriptPromise NotificationManager::requestPermission(ScriptState* scriptState, NotificationPermissionCallback* deprecatedCallback)
 {
     ExecutionContext* context = scriptState->getExecutionContext();
 
     if (!m_permissionService) {
-        Permissions::connectToService(context, mojo::GetProxy(&m_permissionService));
+        connectToPermissionService(context, mojo::GetProxy(&m_permissionService));
         m_permissionService.set_connection_error_handler(convertToBaseCallback(WTF::bind(&NotificationManager::onPermissionServiceConnectionError, wrapWeakPersistent(this))));
     }
 
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
     m_permissionService->RequestPermission(
-        mojom::blink::PermissionName::NOTIFICATIONS, context->getSecurityOrigin(), UserGestureIndicator::processingUserGesture(),
+        createPermissionDescriptor(mojom::blink::PermissionName::NOTIFICATIONS), context->getSecurityOrigin(), UserGestureIndicator::processingUserGesture(),
         convertToBaseCallback(WTF::bind(&NotificationManager::onPermissionRequestComplete, wrapPersistent(this), wrapPersistent(resolver), wrapPersistent(deprecatedCallback))));
 
     return promise;
 }
 
 void NotificationManager::contextDestroyed()
 {
     m_notificationService.reset();
     m_permissionService.reset();
 }
@@ skipping 12 matching lines @@
     m_permissionService.reset();
 }
 
 DEFINE_TRACE(NotificationManager)
 {
     ContextLifecycleObserver::trace(visitor);
     Supplement<ExecutionContext>::trace(visitor);
 }
 
 } // namespace blink