Revert of Oilpan: Move MediaStreamSource, MediaStreamComponent and MediaStreamDescriptor

Source/modules/mediastream/MediaStream.cpp

Index: Source/modules/mediastream/MediaStream.cpp
diff --git a/Source/modules/mediastream/MediaStream.cpp b/Source/modules/mediastream/MediaStream.cpp
index de217991a7d9bff2c9e696b4834737a12e728292..ac6ca8c77d5dee34c93bf72ce7d1fc9c97b3845b 100644
--- a/Source/modules/mediastream/MediaStream.cpp
+++ b/Source/modules/mediastream/MediaStream.cpp
@@ -89,12 +89,12 @@
     return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, audioTracks, videoTracks));
 }
 
-MediaStream* MediaStream::create(ExecutionContext* context, MediaStreamDescriptor* streamDescriptor)
+MediaStream* MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
 {
     return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, streamDescriptor));
 }
 
-MediaStream::MediaStream(ExecutionContext* context, MediaStreamDescriptor* streamDescriptor)
+MediaStream::MediaStream(ExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
     : ContextLifecycleObserver(context)
     , m_stopped(false)
     , m_descriptor(streamDescriptor)
@@ -150,6 +150,7 @@
 
 MediaStream::~MediaStream()
 {
+    m_descriptor->setClient(0);
 }
 
 bool MediaStream::ended() const
@@ -394,9 +395,7 @@
     visitor->trace(m_audioTracks);
     visitor->trace(m_videoTracks);
     visitor->trace(m_scheduledEvents);
-    visitor->trace(m_descriptor);
     EventTargetWithInlineData::trace(visitor);
-    MediaStreamDescriptorClient::trace(visitor);
 }
 
 } // namespace blink