Revert "Onion soup FuchsiaAudioDeviceFactory"

This reverts commit e511a14a.

Reason for revert: tree closed, compile failure. Speculative revert
https://ci.chromium.org/p/chromium/builders/ci/fuchsia-x64-dbg/13708

Fail to compile:
ld.lld: error: undefined symbol: blink::FuchsiaAudioDeviceFactory::FuchsiaAudioDeviceFactory()


Original change's description:
> Onion soup FuchsiaAudioDeviceFactory
>
> This CL executes phases 5 on the design document [1].
>
> [1] https://docs.google.com/document/d/19Zk6Fv1E-6QTQ2c33rpBjDNEkzlsSKvjb3hWkvZAE80/
>
> It also adds triggers the generation of blink bindings by
> //media//fuchsia/mojom.
>
> BUG=787252
> R=​guidou@chromium.org, haraken@chromium.org
>
> Change-Id: Ic2a1ffaea1f9647d9c2c18d298fc23c58d5cc5bb
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2436749
> Commit-Queue: Antonio Gomes (GMT-4) <tonikitoo@igalia.com>
> Reviewed-by: Kentaro Hara <haraken@chromium.org>
> Reviewed-by: Guido Urdaneta <guidou@chromium.org>
> Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#812057}

TBR=haraken@chromium.org,sergeyu@chromium.org,guidou@chromium.org,tonikitoo@igalia.com

Change-Id: Ie4a55ff77e9442a9bf0404bf58eb3951c69f9c3c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 787252
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440525Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812119}

content/renderer/BUILD.gn

@@ -413,6 +413,8 @@ target(link_target_type, "renderer") {
 
   if (is_fuchsia) {
     sources += [
+      "media/audio/fuchsia_audio_device_factory.cc",
+      "media/audio/fuchsia_audio_device_factory.h",
       "media/fuchsia_renderer_factory.cc",
       "media/fuchsia_renderer_factory.h",
       "render_view_fuchsia.cc",

third_party/blink/renderer/modules/media/audio/fuchsia_audio_device_factory.cc → content/renderer/media/audio/fuchsia_audio_device_factory.cc

@@ -2,27 +2,28 @@
 // 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/media/audio/fuchsia_audio_device_factory.h"
+#include "content/renderer/media/audio/fuchsia_audio_device_factory.h"
 
 #include <fuchsia/media/cpp/fidl.h>
 
+#include "content/public/renderer/render_frame.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/fuchsia/audio/fuchsia_audio_capturer_source.h"
-#include "media/fuchsia/mojom/fuchsia_media_resource_provider.mojom-blink.h"
+#include "media/fuchsia/mojom/fuchsia_media_resource_provider.mojom.h"
 #include "media/fuchsia/mojom/fuchsia_media_resource_provider_mojom_traits.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
-#include "third_party/blink/renderer/core/frame/local_frame.h"
+#include "third_party/blink/public/web/web_frame.h"
 
-namespace blink {
+namespace content {
 
 FuchsiaAudioDeviceFactory::FuchsiaAudioDeviceFactory() = default;
 FuchsiaAudioDeviceFactory::~FuchsiaAudioDeviceFactory() = default;
 
 scoped_refptr<media::AudioRendererSink>
 FuchsiaAudioDeviceFactory::CreateFinalAudioRendererSink(
-    const LocalFrameToken& frame_token,
+    const blink::LocalFrameToken& frame_token,
     const media::AudioSinkParameters& params,
     base::TimeDelta auth_timeout) {
   // Return nullptr to fallback to the default renderer implementation.
@@ -31,8 +32,8 @@ FuchsiaAudioDeviceFactory::CreateFinalAudioRendererSink(
 
 scoped_refptr<media::AudioRendererSink>
 FuchsiaAudioDeviceFactory::CreateAudioRendererSink(
-    WebAudioDeviceSourceType source_type,
-    const LocalFrameToken& frame_token,
+    blink::WebAudioDeviceSourceType source_type,
+    const blink::LocalFrameToken& frame_token,
     const media::AudioSinkParameters& params) {
   // Return nullptr to fallback to the default renderer implementation.
   return nullptr;
@@ -40,8 +41,8 @@ FuchsiaAudioDeviceFactory::CreateAudioRendererSink(
 
 scoped_refptr<media::SwitchableAudioRendererSink>
 FuchsiaAudioDeviceFactory::CreateSwitchableAudioRendererSink(
-    WebAudioDeviceSourceType source_type,
-    const LocalFrameToken& frame_token,
+    blink::WebAudioDeviceSourceType source_type,
+    const blink::LocalFrameToken& frame_token,
     const media::AudioSinkParameters& params) {
   // Return nullptr to fallback to the default renderer implementation.
   return nullptr;
@@ -49,16 +50,21 @@ FuchsiaAudioDeviceFactory::CreateSwitchableAudioRendererSink(
 
 scoped_refptr<media::AudioCapturerSource>
 FuchsiaAudioDeviceFactory::CreateAudioCapturerSource(
-    const LocalFrameToken& frame_token,
+    const blink::LocalFrameToken& frame_token,
     const media::AudioSourceParameters& params) {
-  auto* local_frame = LocalFrame::FromFrameToken(frame_token);
-  if (!local_frame)
+  blink::WebFrame* web_frame = blink::WebFrame::FromFrameToken(frame_token);
+  if (!web_frame)
+    return nullptr;
+
+  int render_frame_id = RenderFrame::GetRoutingIdForWebFrame(web_frame);
+  auto* render_frame = RenderFrame::FromRoutingID(render_frame_id);
+  if (!render_frame)
     return nullptr;
 
   // Connect FuchsiaMediaResourceProvider.
-  mojo::Remote<media::mojom::blink::FuchsiaMediaResourceProvider>
+  mojo::Remote<media::mojom::FuchsiaMediaResourceProvider>
       media_resource_provider;
-  local_frame->GetBrowserInterfaceBroker().GetInterface(
+  render_frame->GetBrowserInterfaceBroker()->GetInterface(
       media_resource_provider.BindNewPipeAndPassReceiver());
 
   // Connect AudioCapturer.
@@ -69,4 +75,4 @@ FuchsiaAudioDeviceFactory::CreateAudioCapturerSource(
       std::move(capturer));
 }
 
-}  // namespace blink
+}  // namespace content
\ No newline at end of file

third_party/blink/public/web/modules/media/audio/fuchsia_audio_device_factory.h → content/renderer/media/audio/fuchsia_audio_device_factory.h

@@ -2,41 +2,41 @@
 // 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_MEDIA_AUDIO_FUCHSIA_AUDIO_DEVICE_FACTORY_H_
-#define THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIA_AUDIO_FUCHSIA_AUDIO_DEVICE_FACTORY_H_
+#ifndef CONTENT_RENDERER_MEDIA_AUDIO_FUCHSIA_AUDIO_DEVICE_FACTORY_H_
+#define CONTENT_RENDERER_MEDIA_AUDIO_FUCHSIA_AUDIO_DEVICE_FACTORY_H_
 
 #include "third_party/blink/public/common/tokens/tokens.h"
 #include "third_party/blink/public/web/modules/media/audio/web_audio_device_factory.h"
 
-namespace blink {
+namespace content {
 
-class FuchsiaAudioDeviceFactory : public WebAudioDeviceFactory {
+class FuchsiaAudioDeviceFactory : public blink::WebAudioDeviceFactory {
  public:
   FuchsiaAudioDeviceFactory();
   ~FuchsiaAudioDeviceFactory() final;
 
  protected:
   scoped_refptr<media::AudioRendererSink> CreateFinalAudioRendererSink(
-      const LocalFrameToken& frame_token,
+      const blink::LocalFrameToken& frame_token,
       const media::AudioSinkParameters& params,
       base::TimeDelta auth_timeout) final;
 
   scoped_refptr<media::AudioRendererSink> CreateAudioRendererSink(
-      WebAudioDeviceSourceType source_type,
-      const LocalFrameToken& frame_token,
+      blink::WebAudioDeviceSourceType source_type,
+      const blink::LocalFrameToken& frame_token,
       const media::AudioSinkParameters& params) final;
 
   scoped_refptr<media::SwitchableAudioRendererSink>
   CreateSwitchableAudioRendererSink(
-      WebAudioDeviceSourceType source_type,
-      const LocalFrameToken& frame_token,
+      blink::WebAudioDeviceSourceType source_type,
+      const blink::LocalFrameToken& frame_token,
       const media::AudioSinkParameters& params) final;
 
   scoped_refptr<media::AudioCapturerSource> CreateAudioCapturerSource(
-      const LocalFrameToken& frame_token,
+      const blink::LocalFrameToken& frame_token,
       const media::AudioSourceParameters& params) final;
 };
 
-}  // namespace blink
+}  // namespace content
 
-#endif  // THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIA_AUDIO_FUCHSIA_AUDIO_DEVICE_FACTORY_H_
+#endif  // CONTENT_RENDERER_MEDIA_AUDIO_FUCHSIA_AUDIO_DEVICE_FACTORY_H_

content/renderer/renderer_main_platform_delegate.h

@@ -16,7 +16,7 @@
 #include "content/public/common/main_function_params.h"
 
 #if defined(OS_FUCHSIA)
-#include "third_party/blink/public/web/modules/media/audio/fuchsia_audio_device_factory.h"
+#include "content/renderer/media/audio/fuchsia_audio_device_factory.h"
 #endif  // defined(OS_FUCHSIA)
 
 namespace content {
@@ -41,8 +41,7 @@ class CONTENT_EXPORT RendererMainPlatformDelegate {
 #endif
 
 #if defined(OS_FUCHSIA)
-  std::unique_ptr<blink::FuchsiaAudioDeviceFactory>
-      fuchsia_audio_device_factory_;
+  std::unique_ptr<FuchsiaAudioDeviceFactory> fuchsia_audio_device_factory_;
 #endif  // defined(OS_FUCHSIA)
 
   DISALLOW_COPY_AND_ASSIGN(RendererMainPlatformDelegate);

content/renderer/renderer_main_platform_delegate_fuchsia.cc

@@ -12,8 +12,7 @@ RendererMainPlatformDelegate::RendererMainPlatformDelegate(
 RendererMainPlatformDelegate::~RendererMainPlatformDelegate() {}
 
 void RendererMainPlatformDelegate::PlatformInitialize() {
-  fuchsia_audio_device_factory_ =
-      std::make_unique<blink::FuchsiaAudioDeviceFactory>();
+  fuchsia_audio_device_factory_ = std::make_unique<FuchsiaAudioDeviceFactory>();
 }
 
 void RendererMainPlatformDelegate::PlatformUninitialize() {

media/fuchsia/mojom/BUILD.gn

@@ -7,11 +7,8 @@ import("//mojo/public/tools/bindings/mojom.gni")
 mojom("mojom") {
   sources = [ "fuchsia_media_resource_provider.mojom" ]
 
-  export_class_attribute_blink = "BLINK_PLATFORM_EXPORT"
-  export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
-  export_header_blink = "third_party/blink/public/platform/web_common.h"
-
-  shared_cpp_typemaps = {
+  cpp_typemaps = [
+    {
       types = [
         {
           mojom = "media.mojom.CdmRequest"
@@ -35,8 +32,6 @@ mojom("mojom") {
         "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media",
         "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media.drm",
       ]
-  }
-
-  cpp_typemaps = [ shared_cpp_typemaps ]
-  blink_cpp_typemaps = [ shared_cpp_typemaps ]
+    },
+  ]
 }

third_party/blink/public/BUILD.gn

@@ -278,7 +278,6 @@ source_set("blink_headers") {
     "platform/websocket_handshake_throttle.h",
     "web/blink.h",
     "web/modules/autofill/web_form_element_observer.h",
-    "web/modules/media/audio/fuchsia_audio_device_factory.h",
     "web/modules/media/audio/web_audio_device_factory.h",
     "web/modules/media/audio/web_audio_input_ipc_factory.h",
     "web/modules/media/audio/web_audio_output_ipc_factory.h",

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

@@ -19,13 +19,4 @@ blink_modules_sources("media") {
     "audio/web_audio_output_ipc_factory.cc",
     "webmediaplayer_util.cc",
   ]
-
-  if (is_fuchsia) {
-    sources += [ "audio/fuchsia_audio_device_factory.cc" ]
-
-    deps = [
-      "//media/fuchsia/audio",
-      "//media/fuchsia/mojom:mojom_blink",
-    ]
-  }
 }

third_party/blink/renderer/modules/media/audio/DEPS

@@ -22,8 +22,4 @@ specific_include_rules = {
         "+base/test/test_mock_time_task_runner.h",
         "+base/threading/thread.h",
     ],
-    "fuchsia_audio_device_factory\.cc" : [
-        "+media/fuchsia/audio/fuchsia_audio_capturer_source.h",
-        "+media/fuchsia/mojom",
-    ],
 }

third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py

@@ -859,10 +859,6 @@ _CONFIG = [
             'base::EraseIf',
             'base::ScopedPlatformFile',
             'mojo::WrapCallbackWithDefaultInvokeIfNotRun',
-
-            # TODO(https://crrev.com/787252): Consider allowlisting fidl::*
-            # usage more broadly in Blink.
-            'fidl::InterfaceHandle',
         ]
     },
     {