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

Source/modules/rtcpeerconnection/RTCPeerConnection.cpp

Index: Source/modules/rtcpeerconnection/RTCPeerConnection.cpp
diff --git a/Source/modules/mediastream/RTCPeerConnection.cpp b/Source/modules/rtcpeerconnection/RTCPeerConnection.cpp
similarity index 97%
rename from Source/modules/mediastream/RTCPeerConnection.cpp
rename to Source/modules/rtcpeerconnection/RTCPeerConnection.cpp
index a5e9b165b18250d19fd9ff45709a50a2e3154f8a..0569e12159f9a1dadf99220e711adf55d545b159 100644
--- a/Source/modules/mediastream/RTCPeerConnection.cpp
+++ b/Source/modules/rtcpeerconnection/RTCPeerConnection.cpp
@@ -29,7 +29,7 @@
  */
 
 #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"
@@ -41,19 +41,19 @@
 #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"
@@ -618,9 +618,9 @@ void RTCPeerConnection::didGenerateICECandidate(const WebRTCICECandidate& webCan
 {
     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));
     }