Add PermissionDescriptor to the permissions Mojo interface.

third_party/WebKit/Source/modules/quota/StorageManager.cpp

Index: third_party/WebKit/Source/modules/quota/StorageManager.cpp
diff --git a/third_party/WebKit/Source/modules/quota/StorageManager.cpp b/third_party/WebKit/Source/modules/quota/StorageManager.cpp
index df590c75a4dd0771835cfce212789a1c4a6f6ca3..05549cd50db39772100ea3e16130e83a7a40350b 100644
--- a/third_party/WebKit/Source/modules/quota/StorageManager.cpp
+++ b/third_party/WebKit/Source/modules/quota/StorageManager.cpp
@@ -9,7 +9,7 @@
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
-#include "modules/permissions/Permissions.h"
+#include "modules/permissions/PermissionUtils.h"
 #include "modules/quota/StorageEstimate.h"
 #include "platform/StorageQuotaCallbacks.h"
 #include "platform/UserGestureIndicator.h"
@@ -81,7 +81,7 @@ ScriptPromise StorageManager::persist(ScriptState* scriptState)
         resolver->reject(DOMException::create(InvalidStateError, "In its current state, the global scope can't request permissions."));
         return promise;
     }
-    permissionService->RequestPermission(PermissionName::DURABLE_STORAGE, scriptState->getExecutionContext()->getSecurityOrigin(), UserGestureIndicator::processingUserGesture(), convertToBaseCallback(WTF::bind(&StorageManager::permissionRequestComplete, wrapPersistent(this), wrapPersistent(resolver))));
+    permissionService->RequestPermission(createPermissionDescriptor(PermissionName::DURABLE_STORAGE), scriptState->getExecutionContext()->getSecurityOrigin(), UserGestureIndicator::processingUserGesture(), convertToBaseCallback(WTF::bind(&StorageManager::permissionRequestComplete, wrapPersistent(this), wrapPersistent(resolver))));
 
     return promise;
 }
@@ -95,7 +95,7 @@ ScriptPromise StorageManager::persisted(ScriptState* scriptState)
         resolver->reject(DOMException::create(InvalidStateError, "In its current state, the global scope can't query permissions."));
         return promise;
     }
-    permissionService->HasPermission(PermissionName::DURABLE_STORAGE, scriptState->getExecutionContext()->getSecurityOrigin(), convertToBaseCallback(WTF::bind(&StorageManager::permissionRequestComplete, wrapPersistent(this), wrapPersistent(resolver))));
+    permissionService->HasPermission(createPermissionDescriptor(PermissionName::DURABLE_STORAGE), scriptState->getExecutionContext()->getSecurityOrigin(), convertToBaseCallback(WTF::bind(&StorageManager::permissionRequestComplete, wrapPersistent(this), wrapPersistent(resolver))));
     return promise;
 }
 
@@ -125,9 +125,9 @@ DEFINE_TRACE(StorageManager)
 {
 }
 
-mojom::blink::PermissionService* StorageManager::getPermissionService(ExecutionContext* executionContext)
+PermissionService* StorageManager::getPermissionService(ExecutionContext* executionContext)
 {
-    if (!m_permissionService && Permissions::connectToService(executionContext, mojo::GetProxy(&m_permissionService)))
+    if (!m_permissionService && connectToPermissionService(executionContext, mojo::GetProxy(&m_permissionService)))
         m_permissionService.set_connection_error_handler(convertToBaseCallback(WTF::bind(&StorageManager::permissionServiceConnectionError, wrapWeakPersistent(this))));
     return m_permissionService.get();
 }