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

third_party/WebKit/public/platform/WebMediaStreamTrack.h

Index: third_party/WebKit/public/platform/WebMediaStreamTrack.h
diff --git a/third_party/WebKit/public/platform/WebMediaStreamTrack.h b/third_party/WebKit/public/platform/WebMediaStreamTrack.h
index 7bacd76be7ccb0f53007911d7c4e8ea841328d43..9b584b1c78eac4a5b56d7558fe89c11466654d91 100644
--- a/third_party/WebKit/public/platform/WebMediaStreamTrack.h
+++ b/third_party/WebKit/public/platform/WebMediaStreamTrack.h
@@ -41,8 +41,17 @@
 public:
     class ExtraData {
     public:
-        ExtraData() { }
+        ExtraData() : m_owner(0) { }
         virtual ~ExtraData() { }
+
+        BLINK_PLATFORM_EXPORT WebMediaStreamTrack owner();
+
+#if INSIDE_BLINK
+        BLINK_PLATFORM_EXPORT void setOwner(MediaStreamComponent*);
+#endif
+
+    private:
+        MediaStreamComponent* m_owner;
     };
 
     WebMediaStreamTrack() { }
@@ -81,6 +90,7 @@
     BLINK_PLATFORM_EXPORT void setSourceProvider(WebAudioSourceProvider*);
 
 #if INSIDE_BLINK
+    BLINK_PLATFORM_EXPORT WebMediaStreamTrack(PassRefPtr<MediaStreamComponent>);
     BLINK_PLATFORM_EXPORT WebMediaStreamTrack(MediaStreamComponent*);
     BLINK_PLATFORM_EXPORT WebMediaStreamTrack& operator=(MediaStreamComponent*);
     BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<MediaStreamComponent>() const;