Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/modules/mediastream/MediaStreamRegistry.cpp

Index: Source/modules/mediastream/MediaStreamRegistry.cpp
diff --git a/Source/modules/mediastream/MediaStreamRegistry.cpp b/Source/modules/mediastream/MediaStreamRegistry.cpp
index 3be64be14c7991b2ef7e37ee081fae0675fe1928..a51836890cc816ac5970fd505bf4248bd32d481c 100644
--- a/Source/modules/mediastream/MediaStreamRegistry.cpp
+++ b/Source/modules/mediastream/MediaStreamRegistry.cpp
@@ -43,19 +43,19 @@ void MediaStreamRegistry::registerURL(SecurityOrigin*, const KURL& url, URLRegis
 {
     ASSERT(&stream->registry() == this);
     ASSERT(isMainThread());
-    m_webMediaStreams.set(url.string(), static_cast<MediaStream*>(stream)->webStream());
+    m_streamDescriptors.set(url.string(), static_cast<MediaStream*>(stream)->descriptor());
 }
 
 void MediaStreamRegistry::unregisterURL(const KURL& url)
 {
     ASSERT(isMainThread());
-    m_webMediaStreams.remove(url.string());
+    m_streamDescriptors.remove(url.string());
 }
 
-WebKit::WebMediaStream MediaStreamRegistry::lookupWebMediaStream(const String& url)
+MediaStreamDescriptor* MediaStreamRegistry::lookupMediaStreamDescriptor(const String& url)
 {
     ASSERT(isMainThread());
-    return m_webMediaStreams.get(url);
+    return m_streamDescriptors.get(url);
 }
 
 } // namespace WebCore