Revert of [Oilpan] Move MediaStream{Source|Component|Descriptor} to Oilpan heap

third_party/WebKit/Source/modules/mediastream/MediaStream.h

Index: third_party/WebKit/Source/modules/mediastream/MediaStream.h
diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStream.h b/third_party/WebKit/Source/modules/mediastream/MediaStream.h
index 33c769db85358fc6cd01c6aef03a7a2c34f934a7..ab5286f100f550ab7f57e779450a19b657ae7bea 100644
--- a/third_party/WebKit/Source/modules/mediastream/MediaStream.h
+++ b/third_party/WebKit/Source/modules/mediastream/MediaStream.h
@@ -44,13 +44,13 @@
     , public MediaStreamDescriptorClient
     , public ContextLifecycleObserver {
     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(MediaStream);
-    USING_GARBAGE_COLLECTED_MIXIN(MediaStream);
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaStream);
     DEFINE_WRAPPERTYPEINFO();
 public:
     static MediaStream* create(ExecutionContext*);
     static MediaStream* create(ExecutionContext*, MediaStream*);
     static MediaStream* create(ExecutionContext*, const MediaStreamTrackVector&);
-    static MediaStream* create(ExecutionContext*, MediaStreamDescriptor*);
+    static MediaStream* create(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
     ~MediaStream() override;
 
     String id() const { return m_descriptor->id(); }
@@ -77,7 +77,7 @@
     // MediaStreamDescriptorClient
     void streamEnded() override;
 
-    MediaStreamDescriptor* descriptor() const { return m_descriptor; }
+    MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); }
 
     // EventTarget
     const AtomicString& interfaceName() const override;
@@ -91,7 +91,7 @@
     DECLARE_VIRTUAL_TRACE();
 
 private:
-    MediaStream(ExecutionContext*, MediaStreamDescriptor*);
+    MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
     MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, const MediaStreamTrackVector& videoTracks);
 
     // ContextLifecycleObserver
@@ -110,7 +110,7 @@
 
     MediaStreamTrackVector m_audioTracks;
     MediaStreamTrackVector m_videoTracks;
-    Member<MediaStreamDescriptor> m_descriptor;
+    RefPtr<MediaStreamDescriptor> m_descriptor;
 
     Timer<MediaStream> m_scheduledEventTimer;
     WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents;