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

trunk/public/platform/WebMediaStreamTrack.h

Index: trunk/public/platform/WebMediaStreamTrack.h
===================================================================
--- trunk/public/platform/WebMediaStreamTrack.h	(revision 183662)
+++ trunk/public/platform/WebMediaStreamTrack.h	(working copy)
@@ -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,8 +90,10 @@
     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;
     BLINK_PLATFORM_EXPORT operator MediaStreamComponent*() const;
 #endif