Change initDataType and sessionType to be enums

Source/modules/encryptedmedia/MediaKeySession.h

 /*
  * 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 17 matching lines @@
 
 #include "bindings/core/v8/ScriptPromiseProperty.h"
 #include "core/dom/ActiveDOMObject.h"
 #include "core/dom/DOMArrayPiece.h"
 #include "core/dom/DOMException.h"
 #include "modules/EventTargetModules.h"
 #include "modules/encryptedmedia/MediaKeyStatusMap.h"
 #include "platform/Timer.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/WebContentDecryptionModuleSession.h"
+#include "public/platform/WebEncryptedMediaTypes.h"
 
 namespace blink {
 
 class GenericEventQueue;
 class MediaKeys;
 
 // References are held by JS only. However, even if all JS references are
 // dropped, it won't be garbage collected until close event received or
 // MediaKeys goes away (as determined by the validity of a WeakPtr). This allows
 // the CDM to continue to fire events for this session, as long as the session
 // is open.
 //
 // WeakPtr<MediaKeys> is used instead of having MediaKeys and MediaKeySession
 // keep references to each other, and then having to inform the other object
 // when it gets destroyed.
 //
 // Because this object controls the lifetime of the WebContentDecryptionModuleSession,
 // it may outlive any JavaScript references as long as the MediaKeys object is alive.
 // The WebContentDecryptionModuleSession has the same lifetime as this object.
 class MediaKeySession final
     : public RefCountedGarbageCollectedEventTargetWithInlineData<MediaKeySession>
     , public ActiveDOMObject
     , private WebContentDecryptionModuleSession::Client {
     DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<MediaKeySession>);
     DEFINE_WRAPPERTYPEINFO();
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeySession);
 public:
-    static MediaKeySession* create(ScriptState*, MediaKeys*, const String& sessionType);
-    static bool isValidSessionType(const String& sessionType);
+    static MediaKeySession* create(ScriptState*, MediaKeys*, WebEncryptedMediaSessionType);
+    static WebEncryptedMediaInitDataType convertInitDataType(const String& initDataType);
+    static WebEncryptedMediaSessionType convertSessionType(const String& sessionType);
     virtual ~MediaKeySession();
 
     String sessionId() const;
     double expiration() const { return m_expiration; }
     ScriptPromise closed(ScriptState*);
     MediaKeyStatusMap* keyStatuses();
 
     ScriptPromise generateRequest(ScriptState*, const String& initDataType, const DOMArrayPiece& initData);
     ScriptPromise load(ScriptState*, const String& sessionId);
 
@@ skipping 11 matching lines @@
     virtual bool hasPendingActivity() const override;
     virtual void stop() override;
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
     class PendingAction;
     friend class NewSessionResultPromise;
     friend class LoadSessionResultPromise;
 
-    MediaKeySession(ScriptState*, MediaKeys*, const String& sessionType);
+    MediaKeySession(ScriptState*, MediaKeys*, WebEncryptedMediaSessionType);
 
     void actionTimerFired(Timer<MediaKeySession>*);
 
     // WebContentDecryptionModuleSession::Client
     virtual void message(MessageType, const unsigned char* message, size_t messageLength) override;
     virtual void close() override;
     virtual void expirationChanged(double updatedExpiryTimeInMS) override;
     virtual void keysStatusesChange(const WebVector<WebEncryptedMediaKeyInformation>&, bool hasAdditionalUsableKey) override;
 
     // Called by NewSessionResult when the new session has been created.
     void finishGenerateRequest();
 
     // Called by LoadSessionResult when the session has been loaded.
     void finishLoad();
 
     String m_keySystem;
     OwnPtrWillBeMember<GenericEventQueue> m_asyncEventQueue;
     OwnPtr<WebContentDecryptionModuleSession> m_session;
 
     // Used to determine if MediaKeys is still active.
     WeakMember<MediaKeys> m_mediaKeys;
 
     // Session properties.
-    String m_sessionType;
+    WebEncryptedMediaSessionType m_sessionType;
     double m_expiration;
     Member<MediaKeyStatusMap> m_keyStatusesMap;
 
     // Session states.
     bool m_isUninitialized;
     bool m_isCallable;
     bool m_isClosed; // Is the CDM finished with this session?
 
     // Keep track of the closed promise.
     typedef ScriptPromiseProperty<Member<MediaKeySession>, ToV8UndefinedGenerator, RefPtrWillBeMember<DOMException>> ClosedPromise;
     Member<ClosedPromise> m_closedPromise;
 
     HeapDeque<Member<PendingAction>> m_pendingActions;
     Timer<MediaKeySession> m_actionTimer;
 };
 
 } // namespace blink
 
 #endif // MediaKeySession_h