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

Source/core/mediastream/UserMediaRequest.cpp

Index: Source/core/mediastream/UserMediaRequest.cpp
diff --git a/Source/modules/mediastream/UserMediaRequest.cpp b/Source/core/mediastream/UserMediaRequest.cpp
similarity index 95%
rename from Source/modules/mediastream/UserMediaRequest.cpp
rename to Source/core/mediastream/UserMediaRequest.cpp
index 677dedc1574c990e4124b003b46d622aa611f87c..247a4306907224e579377d5885b49f65d653b463 100644
--- a/Source/modules/mediastream/UserMediaRequest.cpp
+++ b/Source/core/mediastream/UserMediaRequest.cpp
@@ -31,7 +31,7 @@
 
 #include "config.h"
 
-#include "modules/mediastream/UserMediaRequest.h"
+#include "core/mediastream/UserMediaRequest.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionMessages.h"
@@ -39,9 +39,9 @@
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/SpaceSplitString.h"
-#include "modules/mediastream/MediaConstraintsImpl.h"
-#include "modules/mediastream/MediaStream.h"
-#include "modules/mediastream/UserMediaController.h"
+#include "core/mediastream/MediaConstraintsImpl.h"
+#include "core/mediastream/MediaStream.h"
+#include "core/mediastream/UserMediaController.h"
 #include "platform/mediastream/MediaStreamCenter.h"
 #include "platform/mediastream/MediaStreamDescriptor.h"
 
@@ -53,9 +53,9 @@ static WebMediaConstraints parseOptions(const Dictionary& options, const String&
 
     Dictionary constraintsDictionary;
     bool ok = options.get(mediaType, constraintsDictionary);
-    if (ok && !constraintsDictionary.isUndefinedOrNull())
+    if (ok && !constraintsDictionary.isUndefinedOrNull()) {
         constraints = MediaConstraintsImpl::create(constraintsDictionary, exceptionState);
-    else {
+    } else {
         bool mediaRequested = false;
         DictionaryHelper::get(options, mediaType, mediaRequested);
         if (mediaRequested)