Oilpan: Enable Oilpan by default in modules/encryptedmedia

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 46 matching lines @@
 // 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 RefCountedWillBeRefCountedGarbageCollected<MediaKeySession>, public ActiveDOMObject, public ScriptWrappable, public EventTargetWithInlineData
+    : public RefCountedGarbageCollected<MediaKeySession>, public ActiveDOMObject, public ScriptWrappable, public EventTargetWithInlineData
     , private blink::WebContentDecryptionModuleSession::Client {
-    REFCOUNTED_EVENT_TARGET(MediaKeySession);
+    DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedGarbageCollected<MediaKeySession>);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeySession);
 public:
-    static PassRefPtrWillBeRawPtr<MediaKeySession> create(ExecutionContext*, blink::WebContentDecryptionModule*, WeakPtrWillBeRawPtr<MediaKeys>);
+    static MediaKeySession* create(ExecutionContext*, blink::WebContentDecryptionModule*, MediaKeys*);
     virtual ~MediaKeySession();
 
     const String& keySystem() const { return m_keySystem; }
     String sessionId() const;
 
     void setError(MediaKeyError*);
     MediaKeyError* error() { return m_error.get(); }
 
     void initializeNewSession(const String& mimeType, const Uint8Array& initData);
     void update(Uint8Array* response, ExceptionState&);
@@ skipping 22 matching lines @@
         const RefPtr<Uint8Array> data;
 
         static PassOwnPtr<PendingAction> CreatePendingUpdate(PassRefPtr<Uint8Array> data);
         static PassOwnPtr<PendingAction> CreatePendingRelease();
         ~PendingAction();
 
     private:
         PendingAction(Type, PassRefPtr<Uint8Array> data);
     };
 
-    MediaKeySession(ExecutionContext*, blink::WebContentDecryptionModule*, WeakPtrWillBeRawPtr<MediaKeys>);
+    MediaKeySession(ExecutionContext*, blink::WebContentDecryptionModule*, MediaKeys*);
     void actionTimerFired(Timer<MediaKeySession>*);
 
     // blink::WebContentDecryptionModuleSession::Client
     virtual void message(const unsigned char* message, size_t messageLength, const blink::WebURL& destinationURL) OVERRIDE;
     virtual void ready() OVERRIDE;
     virtual void close() OVERRIDE;
     virtual void error(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE;
 
     String m_keySystem;
     RefPtr<MediaKeyError> m_error;
     OwnPtr<GenericEventQueue> m_asyncEventQueue;
     OwnPtr<blink::WebContentDecryptionModuleSession> m_session;
 
     // Used to determine if MediaKeys is still active.
-    WeakPtrWillBeWeakMember<MediaKeys> m_keys;
+    WeakMember<MediaKeys> m_keys;
 
     // Is the CDM finished with this session?
     bool m_isClosed;
 
     Deque<OwnPtr<PendingAction> > m_pendingActions;
     Timer<MediaKeySession> m_actionTimer;
 };
 
 }
 
 #endif // MediaKeySession_h