Add PermissionDescriptor to the permissions Mojo interface.

third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.cpp

Index: third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.cpp
diff --git a/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.cpp b/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.cpp
index c670d6d1cd4446b3146c337d280a20d6e3d94a51..40ff31ee25864a53bae51d045437b6c47dfa639d 100644
--- a/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.cpp
+++ b/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.cpp
@@ -23,7 +23,6 @@ namespace blink {
 
 using PortState = WebMIDIAccessorClient::MIDIPortState;
 
-using mojom::blink::PermissionName;
 using mojom::blink::PermissionStatus;
 
 MIDIAccessInitializer::MIDIAccessInitializer(ScriptState* scriptState, const MIDIOptions& options)
@@ -48,16 +47,15 @@ ScriptPromise MIDIAccessInitializer::start()
 
     document->frame()->interfaceProvider()->getInterface(mojo::GetProxy(&m_permissionService));
 
-    bool requestSysEx = m_options.hasSysex() && m_options.sysex();
-    Vector<PermissionName> permissions;
-    permissions.resize(requestSysEx ? 2 : 1);
+    auto permission = mojom::blink::PermissionDescriptor::New();
+    permission->name = mojom::blink::PermissionName::MIDI;
+    auto midiPermission = mojom::blink::MidiPermissionDescriptor::New();
+    midiPermission->sysex = m_options.hasSysex() && m_options.sysex();
+    permission->extension = mojom::blink::PermissionDescriptorExtension::New();
+    permission->extension->set_midi(std::move(midiPermission));
 
-    permissions[0] = PermissionName::MIDI;
-    if (requestSysEx)
-        permissions[1] = PermissionName::MIDI_SYSEX;
-
-    m_permissionService->RequestPermissions(
-        permissions,
+    m_permissionService->RequestPermission(
+        std::move(permission),
         getExecutionContext()->getSecurityOrigin(),
         UserGestureIndicator::processingUserGesture(),
         convertToBaseCallback(WTF::bind(&MIDIAccessInitializer::onPermissionsUpdated, wrapPersistent(this))));
@@ -123,17 +121,10 @@ ExecutionContext* MIDIAccessInitializer::getExecutionContext() const
     return getScriptState()->getExecutionContext();
 }
 
-void MIDIAccessInitializer::onPermissionsUpdated(const Vector<PermissionStatus>& statusArray)
+void MIDIAccessInitializer::onPermissionsUpdated(PermissionStatus status)
 {
-    bool allowed = true;
-    for (const auto status : statusArray) {
-        if (status != PermissionStatus::GRANTED) {
-            allowed = false;
-            break;
-        }
-    }
     m_permissionService.reset();
-    if (allowed)
+    if (status == PermissionStatus::GRANTED)
         m_accessor->startSession();
     else
         reject(DOMException::create(SecurityError));