Migrate Audio service typemaps to GN

Bug: 1059389
Change-Id: I0bb19abd33c9aa9e88220d106c208871b11976fd
Tbr: tommi@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2108533
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: Alex Gough <ajgo@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Auto-Submit: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#751530}

mojo/public/tools/bindings/chromium_bindings_configuration.gni

@@ -33,7 +33,6 @@ _typemap_imports = [
   "//media/mojo/mojom/typemaps.gni",
   "//mojo/public/cpp/bindings/tests/chromium_typemaps.gni",
   "//sandbox/mac/mojom/typemaps.gni",
-  "//services/audio/public/cpp/typemaps.gni",
   "//services/device/public/mojom/typemaps.gni",
   "//services/media_session/public/cpp/typemaps.gni",
   "//services/network/public/cpp/typemaps.gni",

services/audio/public/cpp/DEPS

+specific_include_rules = {
+  'audio_processing_mojom_traits\.h': [
+    "+third_party/webrtc/api/media_stream_interface.h",
+  ]
+}

services/audio/public/cpp/audio_device_description.typemap

-# Copyright 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-mojom = "//services/audio/public/mojom/audio_device_description.mojom"
-public_headers = [ "//media/audio/audio_device_description.h" ]
-traits_headers =
-    [ "//services/audio/public/cpp/audio_device_description_mojom_traits.h" ]
-sources = [
-  "//services/audio/public/cpp/audio_device_description_mojom_traits.cc",
-]
-deps = [
-  "//media",
-]
-type_mappings = [ "audio.mojom.AudioDeviceDescription=::media::AudioDeviceDescription[move_only]" ]

services/audio/public/cpp/audio_processing.typemap

-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-mojom = "//services/audio/public/mojom/audio_processing.mojom"
-public_headers = [
-  "//media/base/audio_processing.h",
-  "//third_party/webrtc/api/media_stream_interface.h",
-]
-traits_headers =
-    [ "//services/audio/public/cpp/audio_processing_mojom_traits.h" ]
-sources = [
-  "//services/audio/public/cpp/audio_processing_mojom_traits.cc",
-  "//services/audio/public/cpp/audio_processing_mojom_traits.h",
-]
-public_deps = [
-  "//third_party/webrtc_overrides:webrtc_component",
-]
-type_mappings = [
-  "audio.mojom.AudioProcessingSettings=::media::AudioProcessingSettings",
-  "audio.mojom.AudioProcessingStats=::webrtc::AudioProcessorInterface::AudioProcessorStatistics",
-  "audio.mojom.AutomaticGainControlType=::media::AutomaticGainControlType",
-  "audio.mojom.EchoCancellationType=::media::EchoCancellationType",
-  "audio.mojom.NoiseSuppressionType=::media::NoiseSuppressionType",
-]

services/audio/public/cpp/audio_processing_mojom_traits.h

@@ -7,7 +7,8 @@
 
 #include "media/base/audio_processing.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
-#include "services/audio/public/mojom/audio_processing.mojom.h"
+#include "services/audio/public/mojom/audio_processing.mojom-shared.h"
+#include "third_party/webrtc/api/media_stream_interface.h"
 
 namespace mojo {
 

services/audio/public/cpp/debug_recording.typemap

-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-mojom = "//services/audio/public/mojom/debug_recording.mojom"
-public_headers = [ "//media/audio/audio_debug_recording_helper.h" ]
-traits_headers =
-    [ "//services/audio/public/cpp/debug_recording_mojom_traits.h" ]
-sources = [
-  "//services/audio/public/cpp/debug_recording_mojom_traits.cc",
-]
-deps = [
-  "//media",
-]
-
-type_mappings = [
-  "audio.mojom.DebugRecordingStreamType=::media::AudioDebugRecordingStreamType",
-]

services/audio/public/cpp/typemaps.gni

-# Copyright 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-typemaps = [
-  "//services/audio/public/cpp/audio_device_description.typemap",
-  "//services/audio/public/cpp/audio_processing.typemap",
-  "//services/audio/public/cpp/debug_recording.typemap",
-]

services/audio/public/mojom/BUILD.gn

@@ -21,4 +21,68 @@ mojom("mojom") {
     "//media/mojo/mojom",
     "//mojo/public/mojom/base",
   ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "audio.mojom.AudioDeviceDescription"
+          cpp = "::media::AudioDeviceDescription"
+          move_only = true
+        },
+      ]
+      traits_headers = [
+        "//services/audio/public/cpp/audio_device_description_mojom_traits.h",
+      ]
+      traits_sources = [
+        "//services/audio/public/cpp/audio_device_description_mojom_traits.cc",
+      ]
+      traits_public_deps = [ "//media" ]
+    },
+    {
+      types = [
+        {
+          mojom = "audio.mojom.AudioProcessingSettings"
+          cpp = "::media::AudioProcessingSettings"
+        },
+        {
+          mojom = "audio.mojom.AudioProcessingStats"
+          cpp = "::webrtc::AudioProcessorInterface::AudioProcessorStatistics"
+        },
+        {
+          mojom = "audio.mojom.AutomaticGainControlType"
+          cpp = "::media::AutomaticGainControlType"
+        },
+        {
+          mojom = "audio.mojom.EchoCancellationType"
+          cpp = "::media::EchoCancellationType"
+        },
+        {
+          mojom = "audio.mojom.NoiseSuppressionType"
+          cpp = "::media::NoiseSuppressionType"
+        },
+      ]
+      traits_headers =
+          [ "//services/audio/public/cpp/audio_processing_mojom_traits.h" ]
+      traits_sources =
+          [ "//services/audio/public/cpp/audio_processing_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//media",
+        "//third_party/webrtc_overrides:webrtc_component",
+      ]
+    },
+    {
+      types = [
+        {
+          mojom = "audio.mojom.DebugRecordingStreamType"
+          cpp = "::media::AudioDebugRecordingStreamType"
+        },
+      ]
+      traits_headers =
+          [ "//services/audio/public/cpp/debug_recording_mojom_traits.h" ]
+      traits_sources =
+          [ "//services/audio/public/cpp/debug_recording_mojom_traits.cc" ]
+      traits_public_deps = [ "//media" ]
+    },
+  ]
 }