Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

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

 /*
  * Copyright (C) 2012 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "core/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h"
 
 #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"
 #include "core/platform/mediastream/RTCSessionDescriptionRequest.h"
 #include "core/platform/mediastream/RTCStatsRequest.h"
 #include "core/platform/mediastream/RTCVoidRequest.h"
 #include "core/platform/mediastream/chromium/RTCDTMFSenderHandlerChromium.h"
 #include "core/platform/mediastream/chromium/RTCDataChannelHandlerChromium.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebMediaConstraints.h"
@@ skipping 80 matching lines @@
 WebKit::WebRTCSessionDescription RTCPeerConnectionHandlerChromium::localDescription()
 {
     return m_webHandler->localDescription();
 }
 
 WebKit::WebRTCSessionDescription RTCPeerConnectionHandlerChromium::remoteDescription()
 {
     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);
 }
 
 void RTCPeerConnectionHandlerChromium::getStats(PassRefPtr<RTCStatsRequest> request)
 {
     m_webHandler->getStats(request);
 }
 
 PassOwnPtr<RTCDataChannelHandler> RTCPeerConnectionHandlerChromium::createDataChannel(const String& label, const WebKit::WebRTCDataChannelInit& init)
@@ skipping 37 matching lines @@
 void RTCPeerConnectionHandlerChromium::didChangeICEGatheringState(WebKit::WebRTCPeerConnectionHandlerClient::ICEGatheringState state)
 {
     m_client->didChangeIceGatheringState(static_cast<RTCPeerConnectionHandlerClient::IceGatheringState>(state));
 }
 
 void RTCPeerConnectionHandlerChromium::didChangeICEConnectionState(WebKit::WebRTCPeerConnectionHandlerClient::ICEConnectionState state)
 {
     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)
 {
     ASSERT(webHandler);
     m_client->didAddRemoteDataChannel(RTCDataChannelHandlerChromium::create(webHandler));
 }
 
 } // namespace WebCore