Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

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

Index: Source/core/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp
diff --git a/Source/core/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp b/Source/core/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp
index f29069a05bbf385ea7d5c13219e194a7329bdddb..623e896b3e6652f05b0f25b4b62d30efda6fc864 100644
--- a/Source/core/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp
+++ b/Source/core/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp
@@ -34,7 +34,6 @@
 
 #include "core/platform/mediastream/MediaConstraints.h"
 #include "core/platform/mediastream/MediaStreamComponent.h"
-#include "core/platform/mediastream/MediaStreamSource.h"
 #include "core/platform/mediastream/RTCConfiguration.h"
 #include "core/platform/mediastream/RTCDTMFSenderHandler.h"
 #include "core/platform/mediastream/RTCPeerConnectionHandlerClient.h"
@@ -135,12 +134,12 @@ WebKit::WebRTCSessionDescription RTCPeerConnectionHandlerChromium::remoteDescrip
     return m_webHandler->remoteDescription();
 }
 
-bool RTCPeerConnectionHandlerChromium::addStream(WebKit::WebMediaStream mediaStream, PassRefPtr<MediaConstraints> constraints)
+bool RTCPeerConnectionHandlerChromium::addStream(PassRefPtr<MediaStreamDescriptor> mediaStream, PassRefPtr<MediaConstraints> constraints)
 {
     return m_webHandler->addStream(mediaStream, constraints);
 }
 
-void RTCPeerConnectionHandlerChromium::removeStream(WebKit::WebMediaStream mediaStream)
+void RTCPeerConnectionHandlerChromium::removeStream(PassRefPtr<MediaStreamDescriptor> mediaStream)
 {
     m_webHandler->removeStream(mediaStream);
 }
@@ -198,14 +197,14 @@ void RTCPeerConnectionHandlerChromium::didChangeICEConnectionState(WebKit::WebRT
     m_client->didChangeIceConnectionState(static_cast<RTCPeerConnectionHandlerClient::IceConnectionState>(state));
 }
 
-void RTCPeerConnectionHandlerChromium::didAddRemoteStream(const WebKit::WebMediaStream& webMediaStream)
+void RTCPeerConnectionHandlerChromium::didAddRemoteStream(const WebKit::WebMediaStream& webMediaStreamDescriptor)
 {
-    m_client->didAddRemoteStream(webMediaStream);
+    m_client->didAddRemoteStream(webMediaStreamDescriptor);
 }
 
-void RTCPeerConnectionHandlerChromium::didRemoveRemoteStream(const WebKit::WebMediaStream& webMediaStream)
+void RTCPeerConnectionHandlerChromium::didRemoveRemoteStream(const WebKit::WebMediaStream& webMediaStreamDescriptor)
 {
-    m_client->didRemoveRemoteStream(webMediaStream);
+    m_client->didRemoveRemoteStream(webMediaStreamDescriptor);
 }
 
 void RTCPeerConnectionHandlerChromium::didAddRemoteDataChannel(WebKit::WebRTCDataChannelHandler* webHandler)