Move WebAudioMediaStreamSource out of the Blink exposed API

BUG=704136
R=guidou@chromium.org, haraken@chromium.org

Change-Id: Icb870b2960b669bb43ebb20a697068c3c141b671
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739649
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684500}

third_party/blink/public/BUILD.gn

@@ -156,7 +156,6 @@ source_set("blink_headers") {
     "platform/modules/mediastream/web_media_stream_video_renderer.h",
     "platform/modules/mediastream/web_platform_media_stream_source.h",
     "platform/modules/mediastream/web_platform_media_stream_track.h",
-    "platform/modules/mediastream/webaudio_media_stream_source.h",
     "platform/modules/mediastream/webrtc_uma_histograms.h",
     "platform/modules/remoteplayback/web_remote_playback_client.h",
     "platform/modules/service_worker/web_service_worker_error.h",

third_party/blink/renderer/modules/mediastream/media_stream_utils.cc

@@ -6,11 +6,11 @@
 
 #include "base/single_thread_task_runner.h"
 #include "third_party/blink/public/platform/modules/mediastream/media_stream_audio_source.h"
-#include "third_party/blink/public/platform/modules/mediastream/webaudio_media_stream_source.h"
 #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h"
 #include "third_party/blink/public/web/modules/mediastream/media_stream_video_track.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_component.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_descriptor.h"
+#include "third_party/blink/renderer/platform/mediastream/webaudio_media_stream_source.h"
 #include "third_party/blink/renderer/platform/scheduler/public/thread.h"
 
 namespace blink {

third_party/blink/renderer/platform/BUILD.gn

@@ -479,7 +479,6 @@ jumbo_component("platform") {
     "exported/mediastream/web_media_element_source_utils.cc",
     "exported/mediastream/web_platform_media_stream_source.cc",
     "exported/mediastream/web_platform_media_stream_track.cc",
-    "exported/mediastream/webaudio_media_stream_source.cc",
     "exported/mediastream/webrtc_uma_histograms.cc",
     "exported/platform.cc",
     "exported/service_registry.cc",
@@ -1202,6 +1201,8 @@ jumbo_component("platform") {
     "mediastream/media_stream_source.h",
     "mediastream/media_stream_web_audio_source.cc",
     "mediastream/media_stream_web_audio_source.h",
+    "mediastream/webaudio_media_stream_source.cc",
+    "mediastream/webaudio_media_stream_source.h",
     "mhtml/archive_resource.cc",
     "mhtml/archive_resource.h",
     "mhtml/mhtml_archive.cc",

third_party/blink/renderer/platform/exported/mediastream/webaudio_media_stream_source.cc → third_party/blink/renderer/platform/mediastream/webaudio_media_stream_source.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/public/platform/modules/mediastream/webaudio_media_stream_source.h"
+#include "third_party/blink/renderer/platform/mediastream/webaudio_media_stream_source.h"
 
 #include <utility>
 

third_party/blink/public/platform/modules/mediastream/webaudio_media_stream_source.h → third_party/blink/renderer/platform/mediastream/webaudio_media_stream_source.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_MEDIASTREAM_WEBAUDIO_MEDIA_STREAM_SOURCE_H_
-#define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_MEDIASTREAM_WEBAUDIO_MEDIA_STREAM_SOURCE_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_MEDIASTREAM_WEBAUDIO_MEDIA_STREAM_SOURCE_H_
+#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_MEDIASTREAM_WEBAUDIO_MEDIA_STREAM_SOURCE_H_
 
 #include <memory>
 
@@ -12,9 +12,9 @@
 #include "media/base/audio_push_fifo.h"
 #include "third_party/blink/public/platform/modules/mediastream/media_stream_audio_source.h"
 #include "third_party/blink/public/platform/web_audio_destination_consumer.h"
-#include "third_party/blink/public/platform/web_common.h"
 #include "third_party/blink/public/platform/web_media_stream_source.h"
 #include "third_party/blink/public/platform/web_vector.h"
+#include "third_party/blink/renderer/platform/platform_export.h"
 
 namespace blink {
 
@@ -22,7 +22,7 @@ namespace blink {
 // audio data (i.e., the output from a graph of WebAudio nodes) to one or more
 // MediaStreamAudioTracks. Audio data is transported directly to the tracks in
 // 10 ms chunks.
-class BLINK_PLATFORM_EXPORT WebAudioMediaStreamSource final
+class PLATFORM_EXPORT WebAudioMediaStreamSource final
     : public MediaStreamAudioSource,
       public WebAudioDestinationConsumer {
  public:
@@ -82,4 +82,4 @@ class BLINK_PLATFORM_EXPORT WebAudioMediaStreamSource final
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_MEDIASTREAM_WEBAUDIO_MEDIA_STREAM_SOURCE_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_MEDIASTREAM_WEBAUDIO_MEDIA_STREAM_SOURCE_H_

third_party/blink/renderer/platform/webrtc/peer_connection_remote_audio_source.h

@@ -20,9 +20,6 @@ class AudioBus;
 
 namespace blink {
 
-// TODO(crbug.com/704136): Move the classes below out of the Blink exposed
-// API when all users of it have been Onion souped.
-
 // PeerConnectionRemoteAudioTrack is a WebRTC specific implementation of an
 // audio track whose data is sourced from a PeerConnection.
 class PLATFORM_EXPORT PeerConnectionRemoteAudioTrack final
@@ -57,7 +54,7 @@ class PLATFORM_EXPORT PeerConnectionRemoteAudioTrack final
 };
 
 // Represents the audio provided by the receiving end of a PeerConnection.
-class BLINK_PLATFORM_EXPORT PeerConnectionRemoteAudioSource final
+class PLATFORM_EXPORT PeerConnectionRemoteAudioSource final
     : public MediaStreamAudioSource,
       protected webrtc::AudioTrackSinkInterface {
  public: