Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/modules/mediastream/MediaStreamRegistry.h

Index: Source/modules/mediastream/MediaStreamRegistry.h
diff --git a/Source/modules/mediastream/MediaStreamRegistry.h b/Source/modules/mediastream/MediaStreamRegistry.h
index 9f3b621051815ae51fc9d4279e128eab72710057..84e31b7c4ac8748136d4e5ad5158eca25e59b9f4 100644
--- a/Source/modules/mediastream/MediaStreamRegistry.h
+++ b/Source/modules/mediastream/MediaStreamRegistry.h
@@ -26,7 +26,6 @@
 #define MediaStreamRegistry_h
 
 #include "core/html/URLRegistry.h"
-#include "public/platform/WebMediaStream.h"
 #include "wtf/HashMap.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/text/StringHash.h"
@@ -35,6 +34,7 @@ namespace WebCore {
 
 class KURL;
 class MediaStream;
+class MediaStreamDescriptor;
 
 class MediaStreamRegistry : public URLRegistry {
 public:
@@ -45,10 +45,10 @@ public:
     virtual void registerURL(SecurityOrigin*, const KURL&, URLRegistrable*) OVERRIDE;
     virtual void unregisterURL(const KURL&) OVERRIDE;
 
-    WebKit::WebMediaStream lookupWebMediaStream(const String& url);
+    MediaStreamDescriptor* lookupMediaStreamDescriptor(const String& url);
 
 private:
-    HashMap<String, WebKit::WebMediaStream > m_webMediaStreams;
+    HashMap<String, RefPtr<MediaStreamDescriptor> > m_streamDescriptors;
 };
 
 } // namespace WebCore