Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/modules/mediastream/MediaStreamRegistry.cpp

 /*
  * Copyright (C) 2011 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.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 25 matching lines @@
     // Since WebWorkers cannot obtain MediaSource objects, we should be on the main thread.
     ASSERT(isMainThread());
     DEFINE_STATIC_LOCAL(MediaStreamRegistry, instance, ());
     return instance;
 }
 
 void MediaStreamRegistry::registerURL(SecurityOrigin*, const KURL& url, URLRegistrable* stream)
 {
     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