Move MediaStream and MediaStreamTrack implementation from modules/mediastream to core/mediastream.

Source/modules/rtcpeerconnection/RTCPeerConnection.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:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 11 matching lines @@
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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 "modules/mediastream/RTCPeerConnection.h"
+#include "modules/rtcpeerconnection/RTCPeerConnection.h"
 
 #include "bindings/core/v8/ArrayValue.h"
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/VoidCallback.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
-#include "modules/mediastream/MediaConstraintsImpl.h"
-#include "modules/mediastream/MediaStreamEvent.h"
-#include "modules/mediastream/RTCDTMFSender.h"
-#include "modules/mediastream/RTCDataChannel.h"
-#include "modules/mediastream/RTCDataChannelEvent.h"
-#include "modules/mediastream/RTCErrorCallback.h"
-#include "modules/mediastream/RTCIceCandidateEvent.h"
-#include "modules/mediastream/RTCSessionDescription.h"
-#include "modules/mediastream/RTCSessionDescriptionCallback.h"
-#include "modules/mediastream/RTCSessionDescriptionRequestImpl.h"
-#include "modules/mediastream/RTCStatsCallback.h"
-#include "modules/mediastream/RTCStatsRequestImpl.h"
-#include "modules/mediastream/RTCVoidRequestImpl.h"
+#include "core/mediastream/MediaConstraintsImpl.h"
+#include "core/mediastream/MediaStreamEvent.h"
+#include "modules/rtcpeerconnection/RTCDTMFSender.h"
+#include "modules/rtcpeerconnection/RTCDataChannel.h"
+#include "modules/rtcpeerconnection/RTCDataChannelEvent.h"
+#include "modules/rtcpeerconnection/RTCErrorCallback.h"
+#include "modules/rtcpeerconnection/RTCIceCandidateEvent.h"
+#include "modules/rtcpeerconnection/RTCSessionDescription.h"
+#include "modules/rtcpeerconnection/RTCSessionDescriptionCallback.h"
+#include "modules/rtcpeerconnection/RTCSessionDescriptionRequestImpl.h"
+#include "modules/rtcpeerconnection/RTCStatsCallback.h"
+#include "modules/rtcpeerconnection/RTCStatsRequestImpl.h"
+#include "modules/rtcpeerconnection/RTCVoidRequestImpl.h"
 #include "platform/mediastream/RTCConfiguration.h"
 #include "platform/mediastream/RTCOfferOptions.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebMediaStream.h"
 #include "public/platform/WebRTCConfiguration.h"
 #include "public/platform/WebRTCDataChannelHandler.h"
 #include "public/platform/WebRTCDataChannelInit.h"
 #include "public/platform/WebRTCICECandidate.h"
 #include "public/platform/WebRTCOfferOptions.h"
 #include "public/platform/WebRTCSessionDescription.h"
@@ skipping 544 matching lines @@
 void RTCPeerConnection::negotiationNeeded()
 {
     ASSERT(!m_closed);
     scheduleDispatchEvent(Event::create(EventTypeNames::negotiationneeded));
 }
 
 void RTCPeerConnection::didGenerateICECandidate(const WebRTCICECandidate& webCandidate)
 {
     ASSERT(!m_closed);
     ASSERT(executionContext()->isContextThread());
-    if (webCandidate.isNull())
+    if (webCandidate.isNull()) {
         scheduleDispatchEvent(RTCIceCandidateEvent::create(false, false, nullptr));
-    else {
+    } else {
         RTCIceCandidate* iceCandidate = RTCIceCandidate::create(webCandidate);
         scheduleDispatchEvent(RTCIceCandidateEvent::create(false, false, iceCandidate));
     }
 }
 
 void RTCPeerConnection::didChangeSignalingState(SignalingState newState)
 {
     ASSERT(!m_closed);
     ASSERT(executionContext()->isContextThread());
     changeSignalingState(newState);
@@ skipping 171 matching lines @@
     visitor->trace(m_localStreams);
     visitor->trace(m_remoteStreams);
     visitor->trace(m_dataChannels);
 #if ENABLE(OILPAN)
     visitor->trace(m_scheduledEvents);
 #endif
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace blink