Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/core/platform/mediastream/MediaStreamCenter.h

 /*
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 21 matching lines @@
 #ifndef MediaStreamCenter_h
 #define MediaStreamCenter_h
 
 #include "modules/mediastream/SourceInfo.h"
 #include "public/platform/WebVector.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebKit {
 class WebSourceInfo;
-class WebMediaStream;
 }
 
 namespace WebCore {
 
 class MediaStreamComponent;
+class MediaStreamDescriptor;
 class MediaStreamSourcesQueryClient;
 
 class MediaStreamCenter {
 public:
     virtual ~MediaStreamCenter();
 
     static MediaStreamCenter& instance();
 
     virtual void queryMediaStreamSources(PassRefPtr<MediaStreamSourcesQueryClient>) = 0;
     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
 
 #endif // MediaStreamCenter_h