Change initDataType and sessionType to be enums

Source/modules/encryptedmedia/MediaKeys.cpp

 /*
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 62 matching lines @@
     PendingAction(ContentDecryptionModuleResult* result, PassRefPtr<DOMArrayBuffer> data)
         : m_result(result)
         , m_data(data)
     {
     }
 
     const Member<ContentDecryptionModuleResult> m_result;
     const RefPtr<DOMArrayBuffer> m_data;
 };
 
-MediaKeys::MediaKeys(ExecutionContext* context, const String& keySystem, const blink::WebVector<blink::WebString>& supportedSessionTypes, PassOwnPtr<WebContentDecryptionModule> cdm)
+MediaKeys::MediaKeys(ExecutionContext* context, const String& keySystem, const blink::WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, PassOwnPtr<WebContentDecryptionModule> cdm)
     : ContextLifecycleObserver(context)
     , m_keySystem(keySystem)
     , m_supportedSessionTypes(supportedSessionTypes)
     , m_cdm(cdm)
     , m_timer(this, &MediaKeys::timerFired)
 {
     WTF_LOG(Media, "MediaKeys(%p)::MediaKeys", this);
 
     // Step 4.4 of MediaKeys::create():
     // 4.4.1 Set the keySystem attribute to keySystem.
     ASSERT(!m_keySystem.isEmpty());
 }
 
 MediaKeys::~MediaKeys()
 {
     WTF_LOG(Media, "MediaKeys(%p)::~MediaKeys", this);
 }
 
-MediaKeySession* MediaKeys::createSession(ScriptState* scriptState, const String& sessionType, ExceptionState& exceptionState)
+MediaKeySession* MediaKeys::createSession(ScriptState* scriptState, const String& sessionTypeString, ExceptionState& exceptionState)
 {
     WTF_LOG(Media, "MediaKeys(%p)::createSession", this);
 
     // From http://w3c.github.io/encrypted-media/#createSession
 
     // When this method is invoked, the user agent must run the following steps:
     // 1. If this object's persistent state allowed value is false and
     //    sessionType is not "temporary", throw a new DOMException whose name is
     //    NotSupportedError.
     //    (Chromium ensures that only session types supported by the
     //    configuration are listed in supportedSessionTypes.)
     // 2. If the Key System implementation represented by this object's cdm
     //    implementation value does not support sessionType, throw a new
     //    DOMException whose name is NotSupportedError.
-    bool found = false;
-    for (size_t i = 0; i < m_supportedSessionTypes.size(); i++) {
-        if (m_supportedSessionTypes[i] == blink::WebString(sessionType)) {
-            found = true;
-            break;
-        }
-    }
-    if (!found)
+    WebEncryptedMediaSessionType sessionType = MediaKeySession::convertSessionType(sessionTypeString);
+    if (!sessionTypeSupported(sessionType))
         exceptionState.throwDOMException(NotSupportedError, "Unsupported session type.");
 
     // 3. Let session be a new MediaKeySession object, and initialize it as
     //    follows:
     //    (Initialization is performed in the constructor.)
     // 4. Return session.
     return MediaKeySession::create(scriptState, this, sessionType);
 }
 
 ScriptPromise MediaKeys::setServerCertificate(ScriptState* scriptState, const DOMArrayPiece& serverCertificate)
@@ skipping 24 matching lines @@
 
     // 5. Run the following steps asynchronously (documented in timerFired()).
     m_pendingActions.append(PendingAction::CreatePendingSetServerCertificate(result, serverCertificateBuffer.release()));
     if (!m_timer.isActive())
         m_timer.startOneShot(0, FROM_HERE);
 
     // 6. Return promise.
     return promise;
 }
 
+bool MediaKeys::sessionTypeSupported(WebEncryptedMediaSessionType sessionType)
+{
+    for (size_t i = 0; i < m_supportedSessionTypes.size(); i++) {
+        if (m_supportedSessionTypes[i] == sessionType)
+            return true;
+    }
+
+    return false;
+}
+
 void MediaKeys::timerFired(Timer<MediaKeys>*)
 {
     ASSERT(m_pendingActions.size());
 
     // Swap the queue to a local copy to avoid problems if resolving promises
     // run synchronously.
     HeapDeque<Member<PendingAction>> pendingActions;
     pendingActions.swap(m_pendingActions);
 
     while (!pendingActions.isEmpty()) {
@@ skipping 25 matching lines @@
 
 void MediaKeys::contextDestroyed()
 {
     ContextLifecycleObserver::contextDestroyed();
 
     // We don't need the CDM anymore.
     m_cdm.clear();
 }
 
 } // namespace blink