Move WebAudioMediaStreamAudioSink out of the Blink exposed API

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

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

third_party/blink/public/BUILD.gn

@@ -390,7 +390,6 @@ source_set("blink_headers") {
     "web/modules/mediastream/web_media_stream_device_observer.h",
     "web/modules/mediastream/web_media_stream_renderer_factory.h",
     "web/modules/mediastream/web_media_stream_utils.h",
-    "web/modules/mediastream/webaudio_media_stream_audio_sink.h",
     "web/modules/mediastream/webmediaplayer_ms.h",
     "web/modules/peerconnection/media_stream_remote_video_source.h",
     "web/modules/service_worker/web_service_worker_context_client.h",

third_party/blink/renderer/modules/mediastream/BUILD.gn

@@ -71,6 +71,7 @@ blink_modules_sources("mediastream") {
     "web_media_stream_device_observer.cc",
     "web_media_stream_utils.cc",
     "webaudio_media_stream_audio_sink.cc",
+    "webaudio_media_stream_audio_sink.h",
     "webmediaplayer_ms.cc",
     "webmediaplayer_ms_compositor.cc",
     "webmediaplayer_ms_compositor.h",

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

@@ -30,7 +30,6 @@
 #include "third_party/blink/public/platform/web_media_stream_track.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/public/web/modules/mediastream/webaudio_media_stream_audio_sink.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/dom/dom_exception.h"
@@ -47,6 +46,7 @@
 #include "third_party/blink/renderer/modules/mediastream/media_track_settings.h"
 #include "third_party/blink/renderer/modules/mediastream/overconstrained_error.h"
 #include "third_party/blink/renderer/modules/mediastream/user_media_controller.h"
+#include "third_party/blink/renderer/modules/mediastream/webaudio_media_stream_audio_sink.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
 #include "third_party/blink/renderer/platform/heap/heap_allocator.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_component.h"

third_party/blink/renderer/modules/mediastream/webaudio_media_stream_audio_sink.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/web/modules/mediastream/webaudio_media_stream_audio_sink.h"
+#include "third_party/blink/renderer/modules/mediastream/webaudio_media_stream_audio_sink.h"
 
 #include <string>
 

third_party/blink/public/web/modules/mediastream/webaudio_media_stream_audio_sink.h → third_party/blink/renderer/modules/mediastream/webaudio_media_stream_audio_sink.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_WEB_MODULES_MEDIASTREAM_WEBAUDIO_MEDIA_STREAM_AUDIO_SINK_H_
-#define THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIASTREAM_WEBAUDIO_MEDIA_STREAM_AUDIO_SINK_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_WEBAUDIO_MEDIA_STREAM_AUDIO_SINK_H_
+#define THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_WEBAUDIO_MEDIA_STREAM_AUDIO_SINK_H_
 
 #include <stddef.h>
 
@@ -16,9 +16,9 @@
 #include "media/base/reentrancy_checker.h"
 #include "third_party/blink/public/platform/modules/mediastream/web_media_stream_audio_sink.h"
 #include "third_party/blink/public/platform/web_audio_source_provider.h"
-#include "third_party/blink/public/platform/web_common.h"
 #include "third_party/blink/public/platform/web_media_stream_track.h"
 #include "third_party/blink/public/platform/web_vector.h"
+#include "third_party/blink/renderer/modules/modules_export.h"
 
 namespace media {
 class AudioBus;
@@ -41,10 +41,7 @@ class WebAudioSourceProviderClient;
 // data from the FIFO.
 //
 // Most calls are protected by a lock.
-//
-// TODO(crbug.com/704136): Move this class out of the Blink exposed API
-// when all users of it have been Onion souped.
-class BLINK_MODULES_EXPORT WebAudioMediaStreamAudioSink
+class MODULES_EXPORT WebAudioMediaStreamAudioSink
     : public WebAudioSourceProvider,
       public media::AudioConverter::InputCallback,
       public WebMediaStreamAudioSink {
@@ -120,4 +117,4 @@ class BLINK_MODULES_EXPORT WebAudioMediaStreamAudioSink
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIASTREAM_WEBAUDIO_MEDIA_STREAM_AUDIO_SINK_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_WEBAUDIO_MEDIA_STREAM_AUDIO_SINK_H_

third_party/blink/renderer/modules/mediastream/webaudio_media_stream_audio_sink_test.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/web/modules/mediastream/webaudio_media_stream_audio_sink.h"
+#include "third_party/blink/renderer/modules/mediastream/webaudio_media_stream_audio_sink.h"
 
 #include <stddef.h>