Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp

Index: Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp
diff --git a/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp b/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp
index ff0cd1f9cca8f3ca8dcb76242accd9a5a306107e..8dc3b085b344c386bf5134c53f89795af861d55f 100644
--- a/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp
+++ b/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp
@@ -32,7 +32,7 @@
 
 #include "core/platform/mediastream/chromium/MediaStreamCenterChromium.h"
 
-#include "core/platform/mediastream/MediaStreamComponent.h"
+#include "core/platform/mediastream/MediaStreamDescriptor.h"
 #include "core/platform/mediastream/MediaStreamSourcesQueryClient.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebMediaStream.h"
@@ -75,7 +75,7 @@ bool MediaStreamCenterChromium::getSourceInfos(const String& url, WebKit::WebVec
     return m_private && m_private->getSourceInfos(url, sourceInfos);
 }
 
-void MediaStreamCenterChromium::didSetMediaStreamTrackEnabled(WebKit::WebMediaStream stream,  MediaStreamComponent* component)
+void MediaStreamCenterChromium::didSetMediaStreamTrackEnabled(MediaStreamDescriptor* stream,  MediaStreamComponent* component)
 {
     if (m_private) {
         if (component->enabled())
@@ -85,28 +85,28 @@ void MediaStreamCenterChromium::didSetMediaStreamTrackEnabled(WebKit::WebMediaSt
     }
 }
 
-bool MediaStreamCenterChromium::didAddMediaStreamTrack(WebKit::WebMediaStream stream, MediaStreamComponent* component)
+bool MediaStreamCenterChromium::didAddMediaStreamTrack(MediaStreamDescriptor* stream, MediaStreamComponent* component)
 {
     return m_private && m_private->didAddMediaStreamTrack(stream, component);
 }
 
-bool MediaStreamCenterChromium::didRemoveMediaStreamTrack(WebKit::WebMediaStream stream, MediaStreamComponent* component)
+bool MediaStreamCenterChromium::didRemoveMediaStreamTrack(MediaStreamDescriptor* stream, MediaStreamComponent* component)
 {
     return m_private && m_private->didRemoveMediaStreamTrack(stream, component);
 }
 
-void MediaStreamCenterChromium::didStopLocalMediaStream(WebKit::WebMediaStream stream)
+void MediaStreamCenterChromium::didStopLocalMediaStream(MediaStreamDescriptor* stream)
 {
     if (m_private) {
         m_private->didStopLocalMediaStream(stream);
-        for (unsigned i = 0; i < stream.numberOfAudioComponents(); i++)
-            stream.audioComponent(i)->source()->setReadyState(MediaStreamSource::ReadyStateEnded);
-        for (unsigned i = 0; i < stream.numberOfVideoComponents(); i++)
-            stream.videoComponent(i)->source()->setReadyState(MediaStreamSource::ReadyStateEnded);
+        for (unsigned i = 0; i < stream->numberOfAudioComponents(); i++)
+            stream->audioComponent(i)->source()->setReadyState(MediaStreamSource::ReadyStateEnded);
+        for (unsigned i = 0; i < stream->numberOfVideoComponents(); i++)
+            stream->videoComponent(i)->source()->setReadyState(MediaStreamSource::ReadyStateEnded);
     }
 }
 
-void MediaStreamCenterChromium::didCreateMediaStream(WebKit::WebMediaStream stream)
+void MediaStreamCenterChromium::didCreateMediaStream(MediaStreamDescriptor* stream)
 {
     if (m_private) {
         WebKit::WebMediaStream webStream(stream);
@@ -114,7 +114,7 @@ void MediaStreamCenterChromium::didCreateMediaStream(WebKit::WebMediaStream stre
     }
 }
 
-void MediaStreamCenterChromium::stopLocalMediaStream(WebKit::WebMediaStream stream)
+void MediaStreamCenterChromium::stopLocalMediaStream(const WebKit::WebMediaStream& stream)
 {
     endLocalMediaStream(stream);
 }