Revert 182826 "Oilpan: Move MediaStreamSource, MediaStreamCompon..."

trunk/Source/modules/mediastream/MediaStreamTrack.cpp

Index: trunk/Source/modules/mediastream/MediaStreamTrack.cpp
===================================================================
--- trunk/Source/modules/mediastream/MediaStreamTrack.cpp	(revision 183662)
+++ trunk/Source/modules/mediastream/MediaStreamTrack.cpp	(working copy)
@@ -60,6 +60,7 @@
 
 MediaStreamTrack::~MediaStreamTrack()
 {
+    m_component->source()->removeObserver(this);
 }
 
 String MediaStreamTrack::kind() const
@@ -152,9 +153,9 @@
 
 MediaStreamTrack* MediaStreamTrack::clone(ExecutionContext* context)
 {
-    MediaStreamComponent* clonedComponent = MediaStreamComponent::create(component()->source());
-    MediaStreamTrack* clonedTrack = MediaStreamTrack::create(context, clonedComponent);
-    MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent);
+    RefPtr<MediaStreamComponent> clonedComponent = MediaStreamComponent::create(component()->source());
+    MediaStreamTrack* clonedTrack = MediaStreamTrack::create(context, clonedComponent.get());
+    MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent.get());
     return clonedTrack;
 }
 
@@ -237,9 +238,7 @@
 void MediaStreamTrack::trace(Visitor* visitor)
 {
     visitor->trace(m_registeredMediaStreams);
-    visitor->trace(m_component);
     EventTargetWithInlineData::trace(visitor);
-    MediaStreamSource::Observer::trace(visitor);
 }
 
 } // namespace blink