Extract chromeos/dbus/audio/BUILD.gn from chromeos/dbus

This allows specific inclusion of chromeos/dbus/audio only where needed.

For mechanical changes to extensions/ and media/:
TBR=tbarzic@chromium.org

Bug: 940810
Change-Id: I7b98e6bedaab8812603ee0f1da67aef759f54822
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1554141
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#649150}

ash/BUILD.gn

@@ -1336,6 +1336,9 @@ component("ash") {
     "//chromeos/audio",
     "//chromeos/components/multidevice/logging",
     "//chromeos/dbus",
+
+    # TODO(stevenjb): Investigate whether this is OK. https://crbug.com/644336.
+    "//chromeos/dbus/audio",
     "//chromeos/dbus/power",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/dbus/services:services",
@@ -2208,9 +2211,13 @@ static_library("test_support") {
     "//cc:test_support",
     "//chromeos",
 
-    # TODO(stevenjb): Investigate whether this is OK. https://crbug.com/644336.
+    # TODO(https://crbug.com/644336): Move CrasAudioHandler to Chrome or Ash
+    # only and add a mojo client.
     "//chromeos/audio",
     "//chromeos/dbus:test_support",
+
+    # TODO(https://crbug.com/644336): Remove dependencies on CrasAudioClient.
+    "//chromeos/dbus/audio",
     "//chromeos/dbus/power",
     "//chromeos/dbus/system_clock",
 

chrome/browser/chromeos/BUILD.gn

@@ -91,6 +91,7 @@ source_set("chromeos") {
     "//chromeos/dbus:metrics_event_proto",
     "//chromeos/dbus:oobe_config_proto",
     "//chromeos/dbus:plugin_vm_service_proto",
+    "//chromeos/dbus/audio",
     "//chromeos/dbus/auth_policy",
     "//chromeos/dbus/auth_policy:authpolicy_proto",
     "//chromeos/dbus/biod",

chrome/browser/ui/BUILD.gn

@@ -1800,6 +1800,7 @@ jumbo_split_static_library("ui") {
       "//chromeos/components/tether",
       "//chromeos/cryptohome",
       "//chromeos/dbus",
+      "//chromeos/dbus/audio",
       "//chromeos/dbus/cryptohome",
       "//chromeos/dbus/cryptohome:cryptohome_proto",
       "//chromeos/dbus/power",

chromeos/audio/BUILD.gn

@@ -11,7 +11,7 @@ component("audio") {
   deps = [
     "//base",
     "//chromeos/constants",
-    "//chromeos/dbus",
+    "//chromeos/dbus/audio",
     "//components/prefs",
     "//media/base:video_facing",
   ]
@@ -36,7 +36,7 @@ source_set("unit_tests") {
     ":audio",
     "//base/test:test_support",
     "//chromeos/constants",
-    "//chromeos/dbus:test_support",
+    "//chromeos/dbus/audio",
     "//components/prefs:test_support",
     "//media/base:video_facing",
     "//testing/gtest",

chromeos/dbus/BUILD.gn

@@ -42,14 +42,6 @@ component("dbus") {
     "arc_obb_mounter_client.h",
     "arc_oemcrypto_client.cc",
     "arc_oemcrypto_client.h",
-    "audio/audio_node.cc",
-    "audio/audio_node.h",
-    "audio/cras_audio_client.cc",
-    "audio/cras_audio_client.h",
-    "audio/fake_cras_audio_client.cc",
-    "audio/fake_cras_audio_client.h",
-    "audio/volume_state.cc",
-    "audio/volume_state.h",
     "cec_service_client.cc",
     "cec_service_client.h",
     "cicerone_client.cc",
@@ -186,6 +178,7 @@ source_set("unit_tests") {
     ":test_support",
     "//base",
     "//base/test:test_support",
+    "//chromeos/dbus/audio",
     "//chromeos/dbus/auth_policy",
     "//chromeos/dbus/biod:test_support",
     "//chromeos/dbus/cryptohome",

chromeos/dbus/audio/BUILD.gn

+# Copyright 2019 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.
+
+assert(is_chromeos, "Non-Chrome-OS builds cannot depend on //chromeos")
+
+component("audio") {
+  output_name = "chromeos_dbus_audio"
+
+  defines = [ "IS_DBUS_AUDIO_IMPL" ]
+
+  deps = [
+    "//base",
+    "//chromeos/dbus:common",
+    "//dbus",
+  ]
+
+  sources = [
+    "audio_node.cc",
+    "audio_node.h",
+    "cras_audio_client.cc",
+    "cras_audio_client.h",
+    "fake_cras_audio_client.cc",
+    "fake_cras_audio_client.h",
+    "volume_state.cc",
+    "volume_state.h",
+  ]
+}

chromeos/dbus/audio/audio_node.h

@@ -15,7 +15,7 @@
 namespace chromeos {
 
 // Structure to hold AudioNode data received from cras.
-struct COMPONENT_EXPORT(CHROMEOS_DBUS) AudioNode {
+struct COMPONENT_EXPORT(DBUS_AUDIO) AudioNode {
   bool is_input = false;
   uint64_t id = 0;
   bool has_v2_stable_device_id = false;

chromeos/dbus/audio/cras_audio_client.h

@@ -25,7 +25,7 @@ class Bus;
 namespace chromeos {
 
 // CrasAudioClient is used to communicate with the cras audio dbus interface.
-class COMPONENT_EXPORT(CHROMEOS_DBUS) CrasAudioClient {
+class COMPONENT_EXPORT(DBUS_AUDIO) CrasAudioClient {
  public:
   // Interface for observing changes from the cras audio changes.
   class Observer {

chromeos/dbus/audio/fake_cras_audio_client.h

@@ -16,7 +16,7 @@
 namespace chromeos {
 
 // The CrasAudioClient implementation used on Linux desktop.
-class COMPONENT_EXPORT(CHROMEOS_DBUS) FakeCrasAudioClient
+class COMPONENT_EXPORT(DBUS_AUDIO) FakeCrasAudioClient
     : public CrasAudioClient {
  public:
   FakeCrasAudioClient();

chromeos/dbus/audio/volume_state.h

@@ -13,7 +13,7 @@
 
 namespace chromeos {
 
-struct COMPONENT_EXPORT(CHROMEOS_DBUS) VolumeState {
+struct COMPONENT_EXPORT(DBUS_AUDIO) VolumeState {
   int32_t output_volume;
   bool output_system_mute;
   int32_t input_gain;

content/test/BUILD.gn

@@ -1249,10 +1249,7 @@ test("content_browsertests") {
   if (is_chromeos) {
     deps += [
       "//chromeos/audio",
-
-      # TODO(stevenjb): Replace with //chromeos/dbus/audio once extracted.
-      # https://crbug.com/940810.
-      "//chromeos/dbus",
+      "//chromeos/dbus/audio",
     ]
   }
 
@@ -2157,10 +2154,7 @@ test("content_unittests") {
   if (is_chromeos) {
     deps += [
       "//chromeos/audio",
-
-      # TODO(stevenjb): Replace with //chromeos/dbus/audio once extracted.
-      # https://crbug.com/940810.
-      "//chromeos/dbus",
+      "//chromeos/dbus/audio",
     ]
   }
   if (is_android) {

extensions/browser/BUILD.gn

@@ -514,6 +514,7 @@ source_set("browser_tests") {
       "//chromeos",
       "//chromeos/audio",
       "//chromeos/dbus:test_support",
+      "//chromeos/dbus/audio",
       "//chromeos/dbus/media_analytics",
       "//chromeos/dbus/media_analytics:media_perception_proto",
       "//chromeos/dbus/permission_broker",
@@ -724,6 +725,7 @@ source_set("unit_tests") {
     deps += [
       "//chromeos:test_support",
       "//chromeos/dbus:test_support",
+      "//chromeos/dbus/audio",
       "//chromeos/dbus/media_analytics",
       "//chromeos/dbus/media_analytics:media_perception_proto",
       "//chromeos/dbus/power",

extensions/shell/BUILD.gn

@@ -230,6 +230,7 @@ source_set("app_shell_lib") {
       "//chromeos/audio",
       "//chromeos/constants",
       "//chromeos/dbus",
+      "//chromeos/dbus/audio",
       "//chromeos/dbus/power",
       "//chromeos/disks",
       "//chromeos/login/login_state",
@@ -361,6 +362,7 @@ test("app_shell_unittests") {
       "//chromeos/audio",
       "//chromeos/constants",
       "//chromeos/dbus:test_support",
+      "//chromeos/dbus/audio",
       "//chromeos/dbus/power",
     ]
   }

media/audio/BUILD.gn

@@ -424,7 +424,7 @@ source_set("unit_tests") {
     if (!is_chromecast) {
       deps += [
         "//chromeos/audio",
-        "//chromeos/dbus:test_support",
+        "//chromeos/dbus/audio",
       ]
     }