Implement AwPermissionManager::RequestPermissions

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

 // Copyright 2014 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/webmidi/MIDIAccessInitializer.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
@@ skipping 28 matching lines @@
 {
     ScriptPromise promise = this->promise();
     m_accessor = MIDIAccessor::create(this);
 
     Document* document = toDocument(getExecutionContext());
     DCHECK(document);
 
     document->frame()->serviceRegistry()->connectToRemoteService(mojo::GetProxy(&m_permissionService));
 
     bool requestSysEx = m_options.hasSysex() && m_options.sysex();
-    if (requestSysEx) {
-        Vector<mojom::blink::PermissionName> permissions;
-        permissions.resize(2);
-        permissions.append(mojom::blink::PermissionName::MIDI);
+    Vector<mojom::blink::PermissionName> permissions;
+    permissions.resize(requestSysEx ? 2 : 1);
+    permissions.append(mojom::blink::PermissionName::MIDI);
+    if (requestSysEx)
         permissions.append(mojom::blink::PermissionName::MIDI_SYSEX);
-        m_permissionService->RequestPermissions(
-            mojo::WTFArray<mojom::blink::PermissionName>(std::move(permissions)),
-            getExecutionContext()->getSecurityOrigin()->toString(),
-            UserGestureIndicator::processingUserGesture(),
-            createBaseCallback(WTF::bind(&MIDIAccessInitializer::onPermissionsUpdated, wrapPersistent(this))));
-    } else {
-        // TODO(toyoshim): Merge this MIDI only code path to the other one for
-        // MIDI and MIDI_SYSEX. This is a workaround to pass
-        // org.chromium.android_webview.test.AwPermissionManagerTest#testRequestMultiple
-        // because of RequestPermissions not implemented in AndroidWebView.
-        m_permissionService->RequestPermission(
-            mojom::blink::PermissionName::MIDI,
-            getExecutionContext()->getSecurityOrigin()->toString(),
-            UserGestureIndicator::processingUserGesture(),
-            createBaseCallback(WTF::bind(&MIDIAccessInitializer::onPermissionUpdated, wrapPersistent(this))));
-    }
+    m_permissionService->RequestPermissions(
+        mojo::WTFArray<mojom::blink::PermissionName>(std::move(permissions)),
+        getExecutionContext()->getSecurityOrigin()->toString(),
+        UserGestureIndicator::processingUserGesture(),
+        createBaseCallback(WTF::bind(&MIDIAccessInitializer::onPermissionsUpdated, wrapPersistent(this))));
 
     return promise;
 }
 
 void MIDIAccessInitializer::didAddInputPort(const String& id, const String& manufacturer, const String& name, const String& version, PortState state)
 {
     DCHECK(m_accessor);
     m_portDescriptors.append(PortDescriptor(id, manufacturer, name, MIDIPort::TypeInput, version, state));
 }
 
@@ skipping 59 matching lines @@
         }
     }
     m_permissionService.reset();
     if (allowed)
         m_accessor->startSession();
     else
         reject(DOMException::create(SecurityError));
 
 }
 
-void MIDIAccessInitializer::onPermissionUpdated(mojom::blink::PermissionStatus status)
-{
-    m_permissionService.reset();
-    if (status == mojom::blink::PermissionStatus::GRANTED)
-        m_accessor->startSession();
-    else
-        reject(DOMException::create(SecurityError));
-}
-
 } // namespace blink