Change initDataType and sessionType to be enums

Source/modules/encryptedmedia/MediaKeySystemAccess.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 "config.h"
 #include "modules/encryptedmedia/MediaKeySystemAccess.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "modules/encryptedmedia/ContentDecryptionModuleResultPromise.h"
+#include "modules/encryptedmedia/MediaKeySession.h"
 #include "modules/encryptedmedia/MediaKeys.h"
 #include "modules/encryptedmedia/MediaKeysController.h"
 #include "platform/Logging.h"
 #include "platform/Timer.h"
 #include "public/platform/WebContentDecryptionModule.h"
+#include "public/platform/WebEncryptedMediaTypes.h"
 #include "public/platform/WebMediaKeySystemConfiguration.h"
 
 namespace blink {
 
 namespace {
 
 // This class wraps the promise resolver used when creating MediaKeys
 // and is passed to Chromium to fullfill the promise. This implementation of
 // completeWithCdm() will resolve the promise with a new MediaKeys object,
 // while completeWithError() will reject the promise with an exception.
 // All other complete methods are not expected to be called, and will
 // reject the promise.
 class NewCdmResultPromise : public ContentDecryptionModuleResultPromise {
     WTF_MAKE_NONCOPYABLE(NewCdmResultPromise);
 
 public:
     NewCdmResultPromise(ScriptState* scriptState, const String& keySystem, const blink::WebVector<blink::WebString>& supportedSessionTypes)
         : ContentDecryptionModuleResultPromise(scriptState)
         , m_keySystem(keySystem)
-        , m_supportedSessionTypes(supportedSessionTypes)
+        , m_supportedSessionTypes(supportedSessionTypes.size())
     {
+        // FIXME: WebMediaKeySystemConfiguration should use the enum.
+        for (size_t i = 0; i < supportedSessionTypes.size(); i++)
+            m_supportedSessionTypes[i] = MediaKeySession::convertSessionType(supportedSessionTypes[i]);
     }
 
     virtual ~NewCdmResultPromise()
     {
     }
 
     // ContentDecryptionModuleResult implementation.
     virtual void completeWithContentDecryptionModule(WebContentDecryptionModule* cdm) override
     {
         // NOTE: Continued from step 2.8 of createMediaKeys().
         // 2.9. Let media keys be a new MediaKeys object.
         MediaKeys* mediaKeys = new MediaKeys(executionContext(), m_keySystem, m_supportedSessionTypes, adoptPtr(cdm));
 
         // 2.10. Resolve promise with media keys.
         resolve(mediaKeys);
     }
 
 private:
     const String m_keySystem;
-    const blink::WebVector<blink::WebString> m_supportedSessionTypes;
+    blink::WebVector<blink::WebEncryptedMediaSessionType> m_supportedSessionTypes;
 };
 
 // These methods are the inverses of those with the same names in
 // NavigatorRequestMediaKeySystemAccess.
 static Vector<String> convertInitDataTypes(const WebVector<WebString>& initDataTypes)
 {
     Vector<String> result;
     result.reserveCapacity(initDataTypes.size());
     for (size_t i = 0; i < initDataTypes.size(); i++)
         result.append(initDataTypes[i]);
@@ skipping 73 matching lines @@
 
     // 3. Return promise.
     return promise;
 }
 
 DEFINE_TRACE(MediaKeySystemAccess)
 {
 }
 
 } // namespace blink