Change initDataType and sessionType to be enums

Source/web/WebMediaPlayerClientImpl.h

 /*
  * Copyright (C) 2009 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebMediaPlayerClientImpl_h
 #define WebMediaPlayerClientImpl_h
 
 #include "platform/audio/AudioSourceProvider.h"
 #include "platform/graphics/media/MediaPlayer.h"
 #include "public/platform/WebAudioSourceProviderClient.h"
+#include "public/platform/WebEncryptedMediaTypes.h"
 #include "public/platform/WebMediaPlayerClient.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/ThreadingPrimitives.h"
 
 namespace blink {
 
 class AudioSourceProviderClient;
 class HTMLMediaElement;
@@ skipping 15 matching lines @@
     virtual void timeChanged() override;
     virtual void repaint() override;
     virtual void durationChanged() override;
     virtual void sizeChanged() override;
     virtual void playbackStateChanged() override;
 
     // WebEncryptedMediaPlayerClient methods:
     virtual void keyAdded(const WebString& keySystem, const WebString& sessionId) override;
     virtual void keyError(const WebString& keySystem, const WebString& sessionId, MediaKeyErrorCode, unsigned short systemCode) override;
     virtual void keyMessage(const WebString& keySystem, const WebString& sessionId, const unsigned char* message, unsigned messageLength, const WebURL& defaultURL) override;
+    virtual void encrypted(WebEncryptedMediaInitDataType, const unsigned char* initData, unsigned initDataLength) override;
+    // FIXME: Remove this once Chromium updated to use enum type.
     virtual void encrypted(const WebString& initDataType, const unsigned char* initData, unsigned initDataLength) override;
     virtual void didBlockPlaybackWaitingForKey() override;
     virtual void didResumePlaybackBlockedForKey() override;
 
     virtual void setWebLayer(WebLayer*) override;
     virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrackKind, const WebString& label, const WebString& language, bool enabled) override;
     virtual void removeAudioTrack(WebMediaPlayer::TrackId) override;
     virtual WebMediaPlayer::TrackId addVideoTrack(const WebString& id, VideoTrackKind, const WebString& label, const WebString& language, bool selected) override;
     virtual void removeVideoTrack(WebMediaPlayer::TrackId) override;
     virtual void addTextTrack(WebInbandTextTrack*) override;
@@ skipping 69 matching lines @@
         Mutex provideInputLock;
     };
 
     AudioSourceProviderImpl m_audioSourceProvider;
 #endif
 };
 
 } // namespace blink
 
 #endif