Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/core/platform/mediastream/MediaStreamCenter.h

Index: Source/core/platform/mediastream/MediaStreamCenter.h
diff --git a/Source/core/platform/mediastream/MediaStreamCenter.h b/Source/core/platform/mediastream/MediaStreamCenter.h
index bf866209dbe27a9582c714c560ad809ea69a536b..546cbc7fa0996501f15268b10799b1f9eb8ddca5 100644
--- a/Source/core/platform/mediastream/MediaStreamCenter.h
+++ b/Source/core/platform/mediastream/MediaStreamCenter.h
@@ -39,12 +39,12 @@
 
 namespace WebKit {
 class WebSourceInfo;
-class WebMediaStream;
 }
 
 namespace WebCore {
 
 class MediaStreamComponent;
+class MediaStreamDescriptor;
 class MediaStreamSourcesQueryClient;
 
 class MediaStreamCenter {
@@ -57,16 +57,16 @@ public:
     virtual bool getSourceInfos(const String& url, WebKit::WebVector<WebKit::WebSourceInfo>&) = 0;
 
     // Calls from the DOM objects to notify the platform
-    virtual void didSetMediaStreamTrackEnabled(WebKit::WebMediaStream, MediaStreamComponent*) = 0;
-    virtual bool didAddMediaStreamTrack(WebKit::WebMediaStream, MediaStreamComponent*) = 0;
-    virtual bool didRemoveMediaStreamTrack(WebKit::WebMediaStream, MediaStreamComponent*) = 0;
-    virtual void didStopLocalMediaStream(WebKit::WebMediaStream) = 0;
-    virtual void didCreateMediaStream(WebKit::WebMediaStream) = 0;
+    virtual void didSetMediaStreamTrackEnabled(MediaStreamDescriptor*, MediaStreamComponent*) = 0;
+    virtual bool didAddMediaStreamTrack(MediaStreamDescriptor*, MediaStreamComponent*) = 0;
+    virtual bool didRemoveMediaStreamTrack(MediaStreamDescriptor*, MediaStreamComponent*) = 0;
+    virtual void didStopLocalMediaStream(MediaStreamDescriptor*) = 0;
+    virtual void didCreateMediaStream(MediaStreamDescriptor*) = 0;
 
 protected:
     MediaStreamCenter();
 
-    void endLocalMediaStream(WebKit::WebMediaStream);
+    void endLocalMediaStream(MediaStreamDescriptor*);
 };
 
 } // namespace WebCore