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

Source/modules/modules.gypi

 {
   'includes': [
     '../core/core_generated.gypi',
     'modules_generated.gypi',
   ],
   'variables': {
     # Experimental hooks for embedder to provide extra IDL and source files.
     #
     # Note: this is not a supported API. If you rely on this, you will be broken
     # from time to time as the code generator changes in backward incompatible
@@ skipping 69 matching lines @@
       'indexeddb/IDBKeyRange.idl',
       'indexeddb/IDBObjectStore.idl',
       'indexeddb/IDBOpenDBRequest.idl',
       'indexeddb/IDBRequest.idl',
       'indexeddb/IDBTransaction.idl',
       'indexeddb/IDBVersionChangeEvent.idl',
       'mediasource/MediaSource.idl',
       'mediasource/SourceBuffer.idl',
       'mediasource/SourceBufferList.idl',
       'mediasource/VideoPlaybackQuality.idl',
-      'mediastream/MediaDeviceInfo.idl',
-      'mediastream/MediaDeviceInfoCallback.idl',
-      'mediastream/MediaStream.idl',
-      'mediastream/MediaStreamEvent.idl',
-      'mediastream/MediaStreamTrack.idl',
-      'mediastream/MediaStreamTrackEvent.idl',
-      'mediastream/MediaStreamTrackSourcesCallback.idl',
-      'mediastream/NavigatorUserMediaError.idl',
-      'mediastream/NavigatorUserMediaErrorCallback.idl',
-      'mediastream/NavigatorUserMediaSuccessCallback.idl',
-      'mediastream/RTCDTMFSender.idl',
-      'mediastream/RTCDTMFToneChangeEvent.idl',
-      'mediastream/RTCDataChannel.idl',
-      'mediastream/RTCDataChannelEvent.idl',
-      'mediastream/RTCErrorCallback.idl',
-      'mediastream/RTCIceCandidate.idl',
-      'mediastream/RTCIceCandidateEvent.idl',
-      'mediastream/RTCPeerConnection.idl',
-      'mediastream/RTCSessionDescription.idl',
-      'mediastream/RTCSessionDescriptionCallback.idl',
-      'mediastream/RTCStatsCallback.idl',
-      'mediastream/RTCStatsReport.idl',
-      'mediastream/RTCStatsResponse.idl',
-      'mediastream/SourceInfo.idl',
       'netinfo/NetworkInformation.idl',
       'notifications/Notification.idl',
       'notifications/NotificationPermissionCallback.idl',
       'performance/WorkerPerformance.idl',
       'presentation/Presentation.idl',
       'push_messaging/PushEvent.idl',
       'push_messaging/PushManager.idl',
       'push_messaging/PushRegistration.idl',
       'quota/DeprecatedStorageInfo.idl',
       'quota/DeprecatedStorageQuota.idl',
       'quota/StorageErrorCallback.idl',
       'quota/StorageInfo.idl',
       'quota/StorageQuota.idl',
       'quota/StorageQuotaCallback.idl',
       'quota/StorageUsageCallback.idl',
+      'rtcpeerconnection/RTCDTMFSender.idl',
+      'rtcpeerconnection/RTCDTMFToneChangeEvent.idl',
+      'rtcpeerconnection/RTCDataChannel.idl',
+      'rtcpeerconnection/RTCDataChannelEvent.idl',
+      'rtcpeerconnection/RTCErrorCallback.idl',
+      'rtcpeerconnection/RTCIceCandidate.idl',
+      'rtcpeerconnection/RTCIceCandidateEvent.idl',
+      'rtcpeerconnection/RTCPeerConnection.idl',
+      'rtcpeerconnection/RTCSessionDescription.idl',
+      'rtcpeerconnection/RTCSessionDescriptionCallback.idl',
+      'rtcpeerconnection/RTCStatsCallback.idl',
+      'rtcpeerconnection/RTCStatsReport.idl',
+      'rtcpeerconnection/RTCStatsResponse.idl', 
       'screen_orientation/ScreenOrientation.idl',
       'serviceworkers/Body.idl',
       'serviceworkers/Cache.idl',
       'serviceworkers/CacheStorage.idl',
       'serviceworkers/ExtendableEvent.idl',
       'serviceworkers/FetchEvent.idl',
       'serviceworkers/Headers.idl',
       'serviceworkers/InstallEvent.idl',
       'serviceworkers/Request.idl',
       'serviceworkers/Response.idl',
@@ skipping 86 matching lines @@
       'filesystem/WorkerGlobalScopeFileSystem.idl',
       'gamepad/NavigatorGamepad.idl',
       'geofencing/NavigatorGeofencing.idl',
       'geofencing/ServiceWorkerGlobalScopeGeofencing.idl',
       'geofencing/WorkerNavigatorGeofencing.idl',
       'geolocation/NavigatorGeolocation.idl',
       'indexeddb/WindowIndexedDatabase.idl',
       'indexeddb/WorkerGlobalScopeIndexedDatabase.idl',
       'mediasource/HTMLVideoElementMediaSource.idl',
       'mediasource/URLMediaSource.idl',
-      'mediastream/NavigatorMediaStream.idl',
-      'mediastream/URLMediaStream.idl',
-      'mediastream/WindowMediaStream.idl',
       'navigatorcontentutils/NavigatorContentUtils.idl',
       'netinfo/NavigatorNetworkInformation.idl',
       'netinfo/WorkerNavigatorNetworkInformation.idl',
       'performance/SharedWorkerPerformance.idl',
       'performance/WorkerGlobalScopePerformance.idl',
       'presentation/NavigatorPresentation.idl',
       'push_messaging/NavigatorPushManager.idl',
       'push_messaging/ServiceWorkerGlobalScopePush.idl',
       'quota/NavigatorStorageQuota.idl',
       'quota/WindowQuota.idl',
@@ skipping 10 matching lines @@
     # interfaces that inherit from Event
     'modules_event_idl_files': [
       'device_light/DeviceLightEvent.idl',
       'device_orientation/DeviceMotionEvent.idl',
       'device_orientation/DeviceOrientationEvent.idl',
       'encryptedmedia/MediaKeyMessageEvent.idl',
       'encryptedmedia/MediaKeyNeededEvent.idl',
       'gamepad/GamepadEvent.idl',
       'geofencing/GeofencingEvent.idl',
       'indexeddb/IDBVersionChangeEvent.idl',
-      'mediastream/MediaStreamEvent.idl',
-      'mediastream/MediaStreamTrackEvent.idl',
-      'mediastream/RTCDTMFToneChangeEvent.idl',
-      'mediastream/RTCDataChannelEvent.idl',
-      'mediastream/RTCIceCandidateEvent.idl',
       'push_messaging/PushEvent.idl',
+      'rtcpeerconnection/RTCDTMFToneChangeEvent.idl',
+      'rtcpeerconnection/RTCDataChannelEvent.idl',
+      'rtcpeerconnection/RTCIceCandidateEvent.idl',
       'serviceworkers/ExtendableEvent.idl',
       'serviceworkers/FetchEvent.idl',
       'serviceworkers/InstallEvent.idl',
       'speech/SpeechRecognitionError.idl',
       'speech/SpeechRecognitionEvent.idl',
       'speech/SpeechSynthesisEvent.idl',
       'webaudio/AudioProcessingEvent.idl',
       'webaudio/OfflineAudioCompletionEvent.idl',
       'webmidi/MIDIConnectionEvent.idl',
       'webmidi/MIDIMessageEvent.idl',
@@ skipping 301 matching lines @@
       'mediasource/MediaSourceRegistry.cpp',
       'mediasource/MediaSourceRegistry.h',
       'mediasource/SourceBuffer.cpp',
       'mediasource/SourceBuffer.h',
       'mediasource/SourceBufferList.cpp',
       'mediasource/SourceBufferList.h',
       'mediasource/URLMediaSource.cpp',
       'mediasource/URLMediaSource.h',
       'mediasource/VideoPlaybackQuality.cpp',
       'mediasource/VideoPlaybackQuality.h',
-      'mediastream/MediaConstraintsImpl.cpp',
-      'mediastream/MediaConstraintsImpl.h',
-      'mediastream/MediaDeviceInfo.cpp',
-      'mediastream/MediaDeviceInfo.h',
-      'mediastream/MediaDeviceInfoCallback.h',
-      'mediastream/MediaDevicesRequest.cpp',
-      'mediastream/MediaDevicesRequest.h',
-      'mediastream/MediaStream.cpp',
-      'mediastream/MediaStream.h',
-      'mediastream/MediaStreamEvent.cpp',
-      'mediastream/MediaStreamEvent.h',
-      'mediastream/MediaStreamRegistry.cpp',
-      'mediastream/MediaStreamRegistry.h',
-      'mediastream/MediaStreamTrack.cpp',
-      'mediastream/MediaStreamTrack.h',
-      'mediastream/MediaStreamTrackEvent.cpp',
-      'mediastream/MediaStreamTrackEvent.h',
-      'mediastream/MediaStreamTrackSourcesCallback.h',
-      'mediastream/MediaStreamTrackSourcesRequestImpl.cpp',
-      'mediastream/MediaStreamTrackSourcesRequestImpl.h',
-      'mediastream/NavigatorMediaStream.cpp',
-      'mediastream/NavigatorMediaStream.h',
-      'mediastream/NavigatorUserMediaError.cpp',
-      'mediastream/NavigatorUserMediaError.h',
-      'mediastream/NavigatorUserMediaErrorCallback.h',
-      'mediastream/NavigatorUserMediaSuccessCallback.h',
-      'mediastream/RTCDTMFSender.cpp',
-      'mediastream/RTCDTMFSender.h',
-      'mediastream/RTCDTMFToneChangeEvent.cpp',
-      'mediastream/RTCDTMFToneChangeEvent.h',
-      'mediastream/RTCDataChannel.cpp',
-      'mediastream/RTCDataChannel.h',
-      'mediastream/RTCDataChannelEvent.cpp',
-      'mediastream/RTCDataChannelEvent.h',
-      'mediastream/RTCErrorCallback.h',
-      'mediastream/RTCIceCandidate.cpp',
-      'mediastream/RTCIceCandidate.h',
-      'mediastream/RTCIceCandidateEvent.cpp',
-      'mediastream/RTCIceCandidateEvent.h',
-      'mediastream/RTCPeerConnection.cpp',
-      'mediastream/RTCPeerConnection.h',
-      'mediastream/RTCSessionDescription.cpp',
-      'mediastream/RTCSessionDescription.h',
-      'mediastream/RTCSessionDescriptionCallback.h',
-      'mediastream/RTCSessionDescriptionRequestImpl.cpp',
-      'mediastream/RTCSessionDescriptionRequestImpl.h',
-      'mediastream/RTCStatsReport.cpp',
-      'mediastream/RTCStatsReport.h',
-      'mediastream/RTCStatsRequestImpl.cpp',
-      'mediastream/RTCStatsRequestImpl.h',
-      'mediastream/RTCStatsResponse.cpp',
-      'mediastream/RTCStatsResponse.h',
-      'mediastream/RTCVoidRequestImpl.cpp',
-      'mediastream/RTCVoidRequestImpl.h',
-      'mediastream/SourceInfo.cpp',
-      'mediastream/SourceInfo.h',
-      'mediastream/URLMediaStream.cpp',
-      'mediastream/URLMediaStream.h',
-      'mediastream/UserMediaClient.h',
-      'mediastream/UserMediaController.cpp',
-      'mediastream/UserMediaController.h',
-      'mediastream/UserMediaRequest.cpp',
-      'mediastream/UserMediaRequest.h',
       'navigatorcontentutils/NavigatorContentUtils.cpp',
       'navigatorcontentutils/NavigatorContentUtils.h',
       'navigatorcontentutils/NavigatorContentUtilsClient.h',
       'netinfo/NavigatorNetworkInformation.cpp',
       'netinfo/NavigatorNetworkInformation.h',
       'netinfo/NetworkInformation.cpp',
       'netinfo/NetworkInformation.h',
       'netinfo/WorkerNavigatorNetworkInformation.cpp',
       'netinfo/WorkerNavigatorNetworkInformation.h',
       'notifications/Notification.cpp',
@@ skipping 43 matching lines @@
       'quota/StorageQuota.cpp',
       'quota/StorageQuota.h',
       'quota/StorageQuotaCallback.h',
       'quota/StorageQuotaCallbacksImpl.cpp',
       'quota/StorageQuotaCallbacksImpl.h',
       'quota/StorageQuotaClient.cpp',
       'quota/StorageQuotaClient.h',
       'quota/StorageUsageCallback.h',
       'quota/WorkerNavigatorStorageQuota.cpp',
       'quota/WorkerNavigatorStorageQuota.h',
+      'rtcpeerconnection/RTCDTMFSender.cpp',
+      'rtcpeerconnection/RTCDTMFSender.h',
+      'rtcpeerconnection/RTCDTMFToneChangeEvent.cpp',
+      'rtcpeerconnection/RTCDTMFToneChangeEvent.h',
+      'rtcpeerconnection/RTCDataChannel.cpp',
+      'rtcpeerconnection/RTCDataChannel.h',
+      'rtcpeerconnection/RTCDataChannelEvent.cpp',
+      'rtcpeerconnection/RTCDataChannelEvent.h',
+      'rtcpeerconnection/RTCErrorCallback.h',
+      'rtcpeerconnection/RTCIceCandidate.cpp',
+      'rtcpeerconnection/RTCIceCandidate.h',
+      'rtcpeerconnection/RTCIceCandidateEvent.cpp',
+      'rtcpeerconnection/RTCIceCandidateEvent.h',
+      'rtcpeerconnection/RTCPeerConnection.cpp',
+      'rtcpeerconnection/RTCPeerConnection.h',
+      'rtcpeerconnection/RTCSessionDescription.cpp',
+      'rtcpeerconnection/RTCSessionDescription.h',
+      'rtcpeerconnection/RTCSessionDescriptionCallback.h',
+      'rtcpeerconnection/RTCSessionDescriptionRequestImpl.cpp',
+      'rtcpeerconnection/RTCSessionDescriptionRequestImpl.h',
+      'rtcpeerconnection/RTCStatsReport.cpp',
+      'rtcpeerconnection/RTCStatsReport.h',
+      'rtcpeerconnection/RTCStatsRequestImpl.cpp',
+      'rtcpeerconnection/RTCStatsRequestImpl.h',
+      'rtcpeerconnection/RTCStatsResponse.cpp',
+      'rtcpeerconnection/RTCStatsResponse.h',
+      'rtcpeerconnection/RTCVoidRequestImpl.cpp',
+      'rtcpeerconnection/RTCVoidRequestImpl.h',
       'screen_orientation/LockOrientationCallback.cpp',
       'screen_orientation/LockOrientationCallback.h',
       'screen_orientation/ScreenScreenOrientation.cpp',
       'screen_orientation/ScreenScreenOrientation.h',
       'screen_orientation/ScreenOrientation.cpp',
       'screen_orientation/ScreenOrientation.h',
       'screen_orientation/ScreenOrientationController.cpp',
       'screen_orientation/ScreenOrientationController.h',
       'screen_orientation/ScreenOrientationDispatcher.cpp',
       'screen_orientation/ScreenOrientationDispatcher.h',
@@ skipping 324 matching lines @@
       'serviceworkers/ServiceWorkerContainerTest.cpp',
       'websockets/DOMWebSocketTest.cpp',
       'websockets/NewWebSocketChannelImplTest.cpp',
       'websockets/WebSocketDeflaterTest.cpp',
       'websockets/WebSocketExtensionDispatcherTest.cpp',
       'websockets/WebSocketExtensionParserTest.cpp',
       'websockets/WebSocketPerMessageDeflateTest.cpp',
     ],
   },
 }