Oilpan: Enable Oilpan by default in modules/encryptedmedia

Source/modules/encryptedmedia/MediaKeys.h

Index: Source/modules/encryptedmedia/MediaKeys.h
diff --git a/Source/modules/encryptedmedia/MediaKeys.h b/Source/modules/encryptedmedia/MediaKeys.h
index 3071dae5aa93506320ee1a401e9345eecc29b2ae..9533b18ecd55552102b44aa8b4783340ee187a7f 100644
--- a/Source/modules/encryptedmedia/MediaKeys.h
+++ b/Source/modules/encryptedmedia/MediaKeys.h
@@ -51,19 +51,17 @@ class ExceptionState;
 
 // References are held by JS and HTMLMediaElement.
 // The WebContentDecryptionModule has the same lifetime as this object.
-class MediaKeys : public RefCountedWillBeGarbageCollectedFinalized<MediaKeys>, public ContextLifecycleObserver, public ScriptWrappable {
+class MediaKeys : public GarbageCollectedFinalized<MediaKeys>, public ContextLifecycleObserver, public ScriptWrappable {
 public:
-    static PassRefPtrWillBeRawPtr<MediaKeys> create(ExecutionContext*, const String& keySystem, ExceptionState&);
+    static MediaKeys* create(ExecutionContext*, const String& keySystem, ExceptionState&);
     ~MediaKeys();
 
     const String& keySystem() const { return m_keySystem; }
 
-    PassRefPtrWillBeRawPtr<MediaKeySession> createSession(ExecutionContext*, const String& contentType, Uint8Array* initData, ExceptionState&);
+    MediaKeySession* createSession(ExecutionContext*, const String& contentType, Uint8Array* initData, ExceptionState&);
 
     static bool isTypeSupported(const String& keySystem, const String& contentType);
 
-    void setMediaElement(HTMLMediaElement*);
-
     blink::WebContentDecryptionModule* contentDecryptionModule();
 
     void trace(Visitor*);
@@ -75,31 +73,26 @@ protected:
     MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<blink::WebContentDecryptionModule>);
     void initializeNewSessionTimerFired(Timer<MediaKeys>*);
 
-    HTMLMediaElement* m_mediaElement;
     const String m_keySystem;
     OwnPtr<blink::WebContentDecryptionModule> m_cdm;
 
     // FIXME: Check whether |initData| can be changed by JS. Maybe we should not pass it as a pointer.
-    struct InitializeNewSessionData {
+    class InitializeNewSessionData {
         ALLOW_ONLY_INLINE_ALLOCATION();
     public:
-        InitializeNewSessionData(PassRefPtrWillBeRawPtr<MediaKeySession> session, const String& contentType, PassRefPtr<Uint8Array> initData)
+        InitializeNewSessionData(MediaKeySession* session, const String& contentType, PassRefPtr<Uint8Array> initData)
             : session(session)
             , contentType(contentType)
             , initData(initData) { }
 
         void trace(Visitor*);
 
-        RefPtrWillBeMember<MediaKeySession> session;
+        Member<MediaKeySession> session;
         String contentType;
         RefPtr<Uint8Array> initData;
     };
-    Deque<InitializeNewSessionData> m_pendingInitializeNewSessionData;
+    HeapDeque<InitializeNewSessionData> m_pendingInitializeNewSessionData;
     Timer<MediaKeys> m_initializeNewSessionTimer;
-
-#if !ENABLE(OILPAN)
-    WeakPtrFactory<MediaKeys> m_weakFactory;
-#endif
 };
 
 }