Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/core/platform/mediastream/MediaStreamComponent.cpp

 /*
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 22 matching lines @@
 
 #include "core/platform/mediastream/MediaStreamComponent.h"
 
 #include "core/platform/UUID.h"
 #include "core/platform/mediastream/MediaStreamSource.h"
 
 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)
     , m_enabled(true)
 {
     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