Revert of Oilpan: Move MediaStreamSource, MediaStreamComponent and MediaStreamDescriptor

Source/modules/mediastream/MediaStreamTrack.h

Index: Source/modules/mediastream/MediaStreamTrack.h
diff --git a/Source/modules/mediastream/MediaStreamTrack.h b/Source/modules/mediastream/MediaStreamTrack.h
index 51d1c627166f851b75a8998c00440168dc2a0fef..c059e6c9021d697d0b0adbaf5f262629827502e4 100644
--- a/Source/modules/mediastream/MediaStreamTrack.h
+++ b/Source/modules/mediastream/MediaStreamTrack.h
@@ -46,7 +46,7 @@
     , public EventTargetWithInlineData
     , public MediaStreamSource::Observer {
     DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStreamTrack>);
-    USING_GARBAGE_COLLECTED_MIXIN(MediaStreamTrack);
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaStreamTrack);
 public:
     static MediaStreamTrack* create(ExecutionContext*, MediaStreamComponent*);
     virtual ~MediaStreamTrack();
@@ -99,7 +99,7 @@
     HeapHashSet<Member<MediaStream> > m_registeredMediaStreams;
     bool m_isIteratingRegisteredMediaStreams;
     bool m_stopped;
-    Member<MediaStreamComponent> m_component;
+    RefPtr<MediaStreamComponent> m_component;
 };
 
 typedef HeapVector<Member<MediaStreamTrack> > MediaStreamTrackVector;