Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/core/platform/mediastream/MediaStreamComponent.cpp

Index: Source/core/platform/mediastream/MediaStreamComponent.cpp
diff --git a/Source/core/platform/mediastream/MediaStreamComponent.cpp b/Source/core/platform/mediastream/MediaStreamComponent.cpp
index 65cfd451089289a4965e3b6b452f201152195754..be913c4fe6a0ab8fdff0c0a6c06aeab28373f9d1 100644
--- a/Source/core/platform/mediastream/MediaStreamComponent.cpp
+++ b/Source/core/platform/mediastream/MediaStreamComponent.cpp
@@ -40,20 +40,20 @@ namespace WebCore {
 
 PassRefPtr<MediaStreamComponent> MediaStreamComponent::create(PassRefPtr<MediaStreamSource> source)
 {
-    return adoptRef(new MediaStreamComponent(createCanonicalUUIDString(), source));
+    return adoptRef(new MediaStreamComponent(createCanonicalUUIDString(), 0, source));
 }
 
 PassRefPtr<MediaStreamComponent> MediaStreamComponent::create(const String& id, PassRefPtr<MediaStreamSource> source)
 {
-    return adoptRef(new MediaStreamComponent(id, source));
+    return adoptRef(new MediaStreamComponent(id, 0, source));
 }
 
-PassRefPtr<MediaStreamComponent> MediaStreamComponent::create(WebKit::WebMediaStream stream, PassRefPtr<MediaStreamSource> source)
+PassRefPtr<MediaStreamComponent> MediaStreamComponent::create(MediaStreamDescriptor* stream, PassRefPtr<MediaStreamSource> source)
 {
     return adoptRef(new MediaStreamComponent(createCanonicalUUIDString(), stream, source));
 }
 
-MediaStreamComponent::MediaStreamComponent(const String& id, WebKit::WebMediaStream stream, PassRefPtr<MediaStreamSource> source)
+MediaStreamComponent::MediaStreamComponent(const String& id, MediaStreamDescriptor* stream, PassRefPtr<MediaStreamSource> source)
     : m_stream(stream)
     , m_source(source)
     , m_id(id)
@@ -62,13 +62,5 @@ MediaStreamComponent::MediaStreamComponent(const String& id, WebKit::WebMediaStr
     ASSERT(m_id.length());
 }
 
-MediaStreamComponent::MediaStreamComponent(const String& id, PassRefPtr<MediaStreamSource> source)
-    : m_source(source)
-    , m_id(id)
-    , m_enabled(true)
-{
-    ASSERT(m_id.length());
-}
-
 } // namespace WebCore