Make //chromeos/dbus a separate component. (Take 2)

Original CL: https://chromium-review.googlesource.com/c/1398782

Fix: Only include chromeos/assistant/buildflags.h inside OS_CHROMEOS

This makes //chomroes/dbus a separate component and removes it from
//chromeos. Components that depend on //chromeos/dbus must now depend
on it explicitly. All DBus dependencies have been removed from
//chromeos.

TBR=thakis@chromium.org,xhwang@chromium.org,isherman@chromium.org,
    hashimoto@chromium.org,mkwst@chromium.org, hidehiko@chromium.org
    reillyg@chromium.org

Bug: 863439
Change-Id: Iae6c109859ec2629fa003940dec181f7913a5fec
Reviewed-on: https://chromium-review.googlesource.com/c/1405445
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#621819}

ash/BUILD.gn

@@ -1369,6 +1369,7 @@ component("ash") {
     # TODO(stevenjb): Investigate whether this is OK. https://crbug.com/644336.
     "//chromeos/audio",
     "//chromeos/components/multidevice/logging",
+    "//chromeos/dbus",
     "//chromeos/dbus:power_manager_proto",
     "//chromeos/dbus/services:services",
     "//chromeos/services/assistant/public:feature_flags",
@@ -1555,6 +1556,7 @@ static_library("ash_shell_lib_with_content") {
 
     # TODO(stevenjb): Investigate whether this is OK. https://crbug.com/644336.
     "//chromeos/audio",
+    "//chromeos/dbus",
     "//components/discardable_memory/public/interfaces",
     "//components/services/font:lib",
     "//components/services/font/public/interfaces",
@@ -1927,11 +1929,11 @@ test("ash_unittests") {
     "//base/test:test_support",
     "//chromeos",
     "//chromeos:test_support",
-    "//chromeos:test_support_without_gmock",
 
     # TODO(stevenjb): Investigate whether this is OK. https://crbug.com/644336.
     "//chromeos/audio",
     "//chromeos/dbus:power_manager_proto",
+    "//chromeos/dbus:test_support",
     "//chromeos/services/assistant:test_support",
     "//chromeos/services/multidevice_setup/public/cpp:test_support",
     "//chromeos/services/multidevice_setup/public/mojom",
@@ -2201,10 +2203,10 @@ static_library("test_support") {
     "//base/test:test_support",
     "//cc:test_support",
     "//chromeos",
-    "//chromeos:test_support_without_gmock",
 
     # TODO(stevenjb): Investigate whether this is OK. https://crbug.com/644336.
     "//chromeos/audio",
+    "//chromeos/dbus:test_support",
     "//components/account_id",
     "//components/prefs:test_support",
     "//components/user_manager:user_manager",

chrome/browser/chromeos/BUILD.gn

@@ -79,6 +79,7 @@ source_set("chromeos") {
     "//chrome/services/diagnosticsd/public/mojom",
     "//chrome/services/file_util/public/cpp",
     "//chromeos",
+    "//chromeos:policy_certificate_provider",
     "//chromeos/assistant:buildflags",
     "//chromeos/attestation",
     "//chromeos/audio",
@@ -89,6 +90,7 @@ source_set("chromeos") {
     "//chromeos/components/proximity_auth",
     "//chromeos/components/tether",
     "//chromeos/cryptohome",
+    "//chromeos/dbus",
     "//chromeos/dbus:attestation_proto",
     "//chromeos/dbus:authpolicy_proto",
     "//chromeos/dbus:biod_proto",
@@ -2069,6 +2071,7 @@ static_library("test_support") {
     "//chromeos",
     "//chromeos/components/drivefs",
     "//chromeos/components/drivefs:test_support",
+    "//chromeos/dbus",
     "//components/crx_file",
     "//components/drive",
     "//components/policy/proto",
@@ -2508,6 +2511,7 @@ source_set("unit_tests") {
     "//chrome/common",
     "//chromeos/components/multidevice:test_support",
     "//chromeos/components/tether:test_support",
+    "//chromeos/dbus",
     "//chromeos/dbus:login_manager_proto",
     "//chromeos/dbus/services:test_support",
     "//chromeos/ime:gencode",

chrome/browser/extensions/BUILD.gn

@@ -958,6 +958,7 @@ jumbo_static_library("extensions") {
       "//chromeos/attestation",
       "//chromeos/components/proximity_auth",
       "//chromeos/cryptohome",
+      "//chromeos/dbus",
       "//chromeos/disks",
       "//chromeos/login/login_state",
       "//chromeos/services/ime/public/mojom",

chrome/browser/metrics/chrome_metrics_service_client.cc

@@ -59,7 +59,6 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/util_constants.h"
-#include "chromeos/assistant/buildflags.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/browser_watcher/stability_paths.h"
 #include "components/crash/core/common/crash_keys.h"
@@ -125,15 +124,17 @@
 #include "chrome/browser/metrics/plugin_metrics_provider.h"
 #endif
 
-#if BUILDFLAG(ENABLE_CROS_ASSISTANT)
-#include "chrome/browser/metrics/assistant_service_metrics_provider.h"
-#endif
-
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/printing/printer_metrics_provider.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
 #include "chrome/browser/signin/signin_status_metrics_provider_chromeos.h"
+#include "chromeos/assistant/buildflags.h"
+
+#if BUILDFLAG(ENABLE_CROS_ASSISTANT)
+#include "chrome/browser/metrics/assistant_service_metrics_provider.h"
+#endif
+
 #endif
 
 #if defined(OS_WIN)
@@ -725,10 +726,12 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
       std::make_unique<PowerMetricsProvider>());
 #endif
 
+#if defined(OS_CHROMEOS)
 #if BUILDFLAG(ENABLE_CROS_ASSISTANT)
   metrics_service_->RegisterMetricsProvider(
       std::make_unique<AssistantServiceMetricsProvider>());
 #endif  // BUILDFLAG(ENABLE_CROS_ASSISTANT)
+#endif  // defined(OS_CHROMEOS)
 }
 
 void ChromeMetricsServiceClient::RegisterUKMProviders() {

chrome/browser/ui/BUILD.gn

@@ -384,7 +384,6 @@ jumbo_split_static_library("ui") {
     "//chrome/common",
     "//chrome/common/net",
     "//chrome/installer/util:with_no_strings",
-    "//chromeos/assistant:buildflags",
     "//components/about_ui",
     "//components/account_id",
     "//components/app_modal",
@@ -1739,6 +1738,7 @@ jumbo_split_static_library("ui") {
       "//ash/public/cpp/resources:ash_public_unscaled_resources",
       "//ash/public/cpp/vector_icons",
       "//chrome/browser/chromeos",
+      "//chromeos/assistant:buildflags",
       "//chromeos/audio",
       "//chromeos/components/multidevice",
       "//chromeos/components/multidevice/debug_webui",
@@ -1746,6 +1746,7 @@ jumbo_split_static_library("ui") {
       "//chromeos/components/proximity_auth",
       "//chromeos/components/tether",
       "//chromeos/cryptohome",
+      "//chromeos/dbus",
       "//chromeos/dbus:cryptohome_proto",
       "//chromeos/login/auth",
       "//chromeos/login/login_state",

chrome/test/BUILD.gn

@@ -5038,7 +5038,8 @@ if (!is_android) {
         "//ash/public/interfaces:test_interfaces",
         "//chrome/browser/chromeos:test_support",
         "//chrome/browser/media/router:test_support",
-        "//chromeos",
+        "//chromeos:test_support",
+        "//chromeos/dbus:test_support",
         "//mojo/core/embedder",
       ]
 

chromeos/BUILD.gn

@@ -29,28 +29,20 @@ component("chromeos") {
   public_deps = [
     ":chromeos_constants",
     ":chromeos_export",
-    ":policy_certificate_provider",
     ":tools",
-    "//chromeos/dbus",
     "//chromeos/geolocation",
     "//chromeos/network",
     "//chromeos/settings",
     "//chromeos/timezone",
-    "//dbus",
   ]
   deps = [
     ":account_manager_proto",
     "//base",
     "//base:i18n",
-    "//base/third_party/dynamic_annotations",
-    "//components/account_id",
     "//components/device_event_log",
-    "//components/policy:cloud_policy_proto_generated_compile",
     "//components/policy/proto",
     "//components/pref_registry",
     "//components/prefs",
-    "//components/user_manager",
-    "//crypto:platform",
     "//google_apis",
     "//services/network/public/cpp:cpp",
     "//third_party/protobuf:protobuf_lite",
@@ -194,7 +186,6 @@ source_set("test_support_source_set") {
     "//chromeos/disks:test_support",
     "//chromeos/login/auth:test_support",
     "//chromeos/login/login_state:test_support",
-    "//components/account_id",
     "//google_apis",
     "//net:test_support",
     "//services/network:test_support",
@@ -221,13 +212,6 @@ source_set("test_support_source_set") {
   ]
 }
 
-static_library("test_support_without_gmock") {
-  testonly = true
-  public_deps = [
-    "//chromeos/dbus",
-  ]
-}
-
 test("chromeos_unittests") {
   configs += [
     "//build/config/linux/dbus",
@@ -236,15 +220,11 @@ test("chromeos_unittests") {
   deps = [
     ":chromeos_buildflags",
     ":test_support",
-    ":test_support_without_gmock",
     "//base/test:test_support",
     "//chromeos/attestation:unit_tests",
     "//chromeos/audio:unit_tests",
     "//chromeos/cryptohome:unit_tests",
-    "//chromeos/dbus:authpolicy_proto",
-    "//chromeos/dbus:cryptohome_proto",
-    "//chromeos/dbus:dbus",
-    "//chromeos/dbus:power_manager_proto",
+    "//chromeos/dbus:test_support",
     "//chromeos/dbus:unit_tests",
     "//chromeos/dbus/services:unit_tests",
     "//chromeos/disks:unit_tests",
@@ -256,14 +236,11 @@ test("chromeos_unittests") {
     "//chromeos/settings:unit_tests",
     "//chromeos/timezone:unit_tests",
     "//chromeos/tpm:unit_tests",
-    "//components/account_id",
     "//components/onc",
     "//components/policy:generated",
     "//components/policy/proto",
     "//components/prefs:test_support",
     "//components/proxy_config",
-    "//crypto",
-    "//crypto:test_support",
     "//dbus:test_support",
     "//google_apis",
     "//mojo/core/embedder",

chromeos/attestation/BUILD.gn

@@ -45,7 +45,7 @@ source_set("unit_tests") {
     ":test_support",
     "//base/test:test_support",
     "//chromeos/cryptohome:test_support",
-    "//chromeos/dbus",
+    "//chromeos/dbus:test_support",
     "//components/account_id",
     "//testing/gmock",
     "//testing/gtest",

chromeos/audio/BUILD.gn

@@ -36,7 +36,7 @@ source_set("unit_tests") {
     ":audio",
     "//base/test:test_support",
     "//chromeos:chromeos_constants",
-    "//chromeos/dbus",
+    "//chromeos/dbus:test_support",
     "//components/prefs:test_support",
     "//media/base:video_facing",
     "//testing/gtest",

chromeos/components/drivefs/BUILD.gn

@@ -20,6 +20,7 @@ component("drivefs") {
     "//base",
     "//chromeos",
     "//chromeos/components/drivefs/mojom",
+    "//chromeos/dbus",
     "//chromeos/disks",
     "//components/account_id",
     "//components/drive",
@@ -46,6 +47,7 @@ source_set("test_support") {
     "//base",
     "//chromeos",
     "//chromeos/components/drivefs/mojom",
+    "//chromeos/dbus",
     "//net",
   ]
 }

chromeos/components/multidevice/BUILD.gn

@@ -31,6 +31,7 @@ static_library("multidevice") {
     "//base:i18n",
     "//chromeos",
     "//chromeos/components/multidevice/logging",
+    "//chromeos/dbus",
     "//chromeos/services/device_sync/proto",
     "//chromeos/services/device_sync/proto:util",
     "//components/prefs",

chromeos/components/proximity_auth/BUILD.gn

@@ -55,6 +55,7 @@ static_library("proximity_auth") {
     "//chromeos/components/multidevice",
     "//chromeos/components/multidevice/logging",
     "//chromeos/components/proximity_auth/public/interfaces",
+    "//chromeos/dbus",
     "//chromeos/services/multidevice_setup/public/cpp",
     "//chromeos/services/multidevice_setup/public/cpp:prefs",
     "//chromeos/services/secure_channel/public/cpp/client",
@@ -119,6 +120,7 @@ source_set("unit_tests") {
     "//chromeos/components/multidevice",
     "//chromeos/components/multidevice:test_support",
     "//chromeos/components/multidevice/logging",
+    "//chromeos/dbus",
     "//chromeos/services/multidevice_setup/public/cpp:prefs",
     "//chromeos/services/multidevice_setup/public/cpp:test_support",
     "//chromeos/services/secure_channel:test_support",

chromeos/components/tether/BUILD.gn

@@ -119,6 +119,7 @@ static_library("tether") {
     "//chromeos",
     "//chromeos/components/multidevice/logging",
     "//chromeos/components/tether/proto",
+    "//chromeos/dbus",
     "//chromeos/login/login_state",
     "//chromeos/services/device_sync/public/cpp",
     "//chromeos/services/multidevice_setup/public/cpp:cpp",
@@ -266,6 +267,7 @@ source_set("unit_tests") {
     "//chromeos/components/multidevice",
     "//chromeos/components/multidevice:test_support",
     "//chromeos/components/tether/proto",
+    "//chromeos/dbus:test_support",
     "//chromeos/login/login_state",
     "//chromeos/services/device_sync:test_support",
     "//chromeos/services/device_sync/public/cpp",

chromeos/cryptohome/BUILD.gn

@@ -59,7 +59,7 @@ source_set("unit_tests") {
     ":test_support",
     "//base",
     "//base/test:test_support",
-    "//chromeos/dbus",
+    "//chromeos/dbus:test_support",
     "//chromeos/login/auth:challenge_response_key",
     "//testing/gtest:gtest",
   ]

chromeos/dbus/BUILD.gn

@@ -2,13 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/chromeos/rules.gni")
 import("//testing/test.gni")
 import("//third_party/protobuf/proto_library.gni")
 
 assert(is_chromeos, "Non-Chrome-OS builds must not depend on //chromeos")
 
-source_set("dbus") {
+component("dbus") {
+  output_name = "chromeos_dbus"  # Avoid conflict with //dbus
   defines = [ "IS_CHROMEOS_DBUS_IMPL" ]
   public_deps = [
     ":constants",
@@ -237,7 +237,7 @@ source_set("dbus") {
 }
 
 source_set("constants") {
-  configs += [ "//chromeos:chromeos_implementation" ]
+  defines = [ "IS_CHROMEOS_DBUS_IMPL" ]
   deps = [
     "//base",
   ]
@@ -252,12 +252,14 @@ source_set("constants") {
 source_set("test_support") {
   testonly = true
   configs += [ "//build/config/linux/dbus" ]
-  deps = [
-    ":biod_proto",
+  public_deps = [
     ":dbus",
-    "//base",
     "//dbus",
     "//dbus:test_support",
+  ]
+  deps = [
+    ":biod_proto",
+    "//base",
     "//testing/gmock",
     "//testing/gtest",
   ]

chromeos/dbus/fake_session_manager_client.h

@@ -11,6 +11,7 @@
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
+#include "base/component_export.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
@@ -21,7 +22,8 @@ namespace chromeos {
 
 // A fake implementation of session_manager. Accepts policy blobs to be set and
 // returns them unmodified.
-class FakeSessionManagerClient : public SessionManagerClient {
+class COMPONENT_EXPORT(CHROMEOS_DBUS) FakeSessionManagerClient
+    : public SessionManagerClient {
  public:
   enum class PolicyStorageType {
     kOnDisk,    // Store policy in regular files on disk. Usually used for

chromeos/dbus/fake_update_engine_client.h

@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/component_export.h"
 #include "base/containers/queue.h"
 #include "chromeos/dbus/update_engine_client.h"
 
@@ -16,7 +17,8 @@ namespace chromeos {
 // use set_update_engine_client_status() to set a fake last Status and
 // GetLastStatus() returns the fake with no modification. Other methods do
 // nothing.
-class FakeUpdateEngineClient : public UpdateEngineClient {
+class COMPONENT_EXPORT(CHROMEOS_DBUS) FakeUpdateEngineClient
+    : public UpdateEngineClient {
  public:
   FakeUpdateEngineClient();
   ~FakeUpdateEngineClient() override;

chromeos/disks/BUILD.gn

@@ -32,8 +32,8 @@ source_set("test_support") {
   deps = [
     "//base",
     "//base/test:test_support",
-    "//chromeos/dbus",
     "//chromeos/dbus:power_manager_proto",
+    "//chromeos/dbus:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
@@ -50,8 +50,8 @@ source_set("unit_tests") {
     ":test_support",
     "//base/test:test_support",
     "//chromeos:chromeos_constants",
-    "//chromeos/dbus",
     "//chromeos/dbus:power_manager_proto",
+    "//chromeos/dbus:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]

chromeos/login/auth/BUILD.gn

@@ -111,8 +111,8 @@ source_set("unit_tests") {
     "//base",
     "//base:i18n",
     "//chromeos:chromeos_constants",
-    "//chromeos/dbus",
     "//chromeos/dbus:authpolicy_proto",
+    "//chromeos/dbus:test_support",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/icu",

chromeos/network/BUILD.gn

@@ -172,7 +172,7 @@ source_set("unit_tests") {
     "//chromeos:chromeos_constants",
     "//chromeos:policy_certificate_provider",
     "//chromeos:test_support_source_set",
-    "//chromeos/dbus",
+    "//chromeos/dbus:test_support",
     "//chromeos/login/login_state",
     "//components/onc",
     "//components/prefs",

chromeos/services/assistant/BUILD.gn

@@ -36,6 +36,7 @@ component("lib") {
     "//build/util:webkit_version",
     "//chromeos",
     "//chromeos/assistant:buildflags",
+    "//chromeos/dbus",
     "//components/account_id",
     "//services/device/public/mojom",
     "//services/identity/public/mojom",
@@ -123,6 +124,7 @@ source_set("tests") {
     "//base",
     "//base/test:test_support",
     "//chromeos",
+    "//chromeos/dbus",
     "//chromeos/services/assistant/public/mojom",
     "//mojo/public/cpp/bindings:bindings",
     "//services/device/public/mojom",

chromeos/services/device_sync/BUILD.gn

@@ -154,9 +154,9 @@ source_set("unit_tests") {
     ":test_support",
     "//base",
     "//base/test:test_support",
-    "//chromeos",
     "//chromeos/components/multidevice",
     "//chromeos/components/multidevice:test_support",
+    "//chromeos/dbus:test_support",
     "//chromeos/services/device_sync/proto:util",
     "//chromeos/services/device_sync/public/cpp:test_support",
     "//chromeos/services/device_sync/public/cpp:unit_tests",

chromeos/services/machine_learning/public/cpp/BUILD.gn

@@ -12,6 +12,7 @@ source_set("cpp") {
   deps = [
     "//base",
     "//chromeos",
+    "//chromeos/dbus",
     "//chromeos/services/machine_learning/public/mojom",
   ]
 }
@@ -25,6 +26,7 @@ source_set("unit_tests") {
     ":cpp",
     "//base/test:test_support",
     "//chromeos",
+    "//chromeos/dbus",
     "//chromeos/services/machine_learning/public/mojom",
     "//mojo/core/embedder",
     "//mojo/public/cpp/bindings",

chromeos/tpm/BUILD.gn

@@ -39,8 +39,8 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//chromeos:chromeos_constants",
     "//chromeos/cryptohome:test_support",
-    "//chromeos/dbus",
     "//chromeos/dbus:cryptohome_proto",
+    "//chromeos/dbus:test_support",
     "//components/policy/proto",
     "//google_apis",
     "//testing/gtest",

components/arc/BUILD.gn

@@ -81,6 +81,7 @@ static_library("arc") {
     "//base",
     "//chromeos",
     "//chromeos/audio",
+    "//chromeos/dbus",
     "//chromeos/dbus:login_manager_proto",
     "//chromeos/dbus:power_manager_proto",
     "//chromeos/disks",
@@ -185,6 +186,7 @@ static_library("arc_base") {
     "//base",
     "//chromeos",
     "//chromeos/cryptohome",
+    "//chromeos/dbus",
     "//chromeos/dbus:login_manager_proto",
     "//components/account_id",
     "//components/keyed_service/content",
@@ -323,9 +325,9 @@ source_set("unit_tests") {
     "//base",
     "//base/test:test_support",
     "//chromeos",
-    "//chromeos:test_support_without_gmock",
     "//chromeos/cryptohome:test_support",
     "//chromeos/dbus:power_manager_proto",
+    "//chromeos/dbus:test_support",
     "//chromeos/disks:test_support",
     "//components/account_id",
     "//components/keyed_service/content",

components/metrics/BUILD.gn

@@ -423,7 +423,10 @@ source_set("unit_tests") {
   }
 
   if (is_chromeos) {
-    deps += [ "//chromeos" ]
+    deps += [
+      "//chromeos",
+      "//chromeos/dbus",
+    ]
   }
 
   # iOS is not supported by the profiler and the ios-simulator bot chokes on

content/browser/BUILD.gn

@@ -2415,6 +2415,7 @@ jumbo_source_set("browser") {
       "//chromeos",
       "//chromeos/assistant:buildflags",
       "//chromeos/audio",
+      "//chromeos/dbus",
       "//chromeos/dbus:power_manager_proto",
       "//components/session_manager/core",
     ]

content/shell/BUILD.gn

@@ -440,6 +440,7 @@ jumbo_static_library("content_shell_lib") {
   if (is_chromeos) {
     deps += [
       "//chromeos",
+      "//chromeos/dbus",
       "//services/ws/test_ws:lib",
       "//services/ws/test_ws:mojom",
       "//ui/wm:test_support",

device/BUILD.gn

@@ -213,7 +213,6 @@ test("device_unittests") {
     deps += [
       "//chromeos",
       "//chromeos:test_support",
-      "//chromeos:test_support_without_gmock",
     ]
   }
 

device/bluetooth/BUILD.gn

@@ -234,7 +234,10 @@ component("bluetooth") {
   }
 
   if (is_chromeos) {
-    deps += [ "//chromeos" ]
+    deps += [
+      "//chromeos",
+      "//chromeos/dbus",
+    ]
   }
 
   if (is_mac) {

device/usb/BUILD.gn

@@ -122,6 +122,7 @@ static_library("usb") {
   if (is_chromeos) {
     deps += [
       "//chromeos",
+      "//chromeos/dbus",
       "//dbus",
     ]
   }

device/usb/mojo/BUILD.gn

@@ -25,6 +25,6 @@ source_set("mojo") {
   ]
 
   if (is_chromeos) {
-    deps += [ "//chromeos/dbus:dbus" ]
+    deps += [ "//chromeos/dbus" ]
   }
 }

extensions/browser/BUILD.gn

@@ -508,6 +508,7 @@ source_set("browser_tests") {
       "//chromeos/audio",
       "//chromeos/dbus:media_perception_proto",
       "//chromeos/dbus:power_manager_proto",
+      "//chromeos/dbus:test_support",
       "//chromeos/login/login_state",
     ]
   }
@@ -695,6 +696,7 @@ source_set("unit_tests") {
     deps += [
       "//chromeos:test_support",
       "//chromeos/dbus:media_perception_proto",
+      "//chromeos/dbus:test_support",
       "//chromeos/login/login_state",
       "//components/feedback",
       "//extensions/shell:app_shell_lib",

extensions/browser/api/BUILD.gn

@@ -143,6 +143,7 @@ source_set("api") {
 
     deps += [
       "//chromeos",
+      "//chromeos/dbus",
       "//chromeos/dbus:media_perception_proto",
       "//chromeos/login/login_state",
       "//chromeos/services/media_perception/public/mojom",

extensions/shell/BUILD.gn

@@ -229,6 +229,7 @@ source_set("app_shell_lib") {
     deps += [
       "//chromeos",
       "//chromeos/audio",
+      "//chromeos/dbus",
       "//chromeos/disks",
       "//chromeos/login/login_state",
       "//ui/chromeos",
@@ -354,9 +355,9 @@ test("app_shell_unittests") {
       "browser/shell_screen_unittest.cc",
     ]
     deps += [
-      "//chromeos",
-      "//chromeos:test_support_without_gmock",
+      "//chromeos:test_support",
       "//chromeos/audio",
+      "//chromeos/dbus:test_support",
     ]
   }
 

media/audio/BUILD.gn

@@ -273,8 +273,8 @@ source_set("audio") {
     ]
     configs += [ ":libcras" ]
     deps += [
-      "//chromeos",
       "//chromeos/audio",
+      "//chromeos/dbus",
     ]
   }
 
@@ -435,8 +435,8 @@ source_set("unit_tests") {
 
     if (!is_chromecast) {
       deps += [
-        "//chromeos",
         "//chromeos/audio",
+        "//chromeos/dbus:test_support",
       ]
     }
 

media/capture/BUILD.gn

@@ -268,7 +268,7 @@ jumbo_component("capture_lib") {
     public_deps += [ "//media/capture/video/chromeos/public" ]
     deps += [
       "//build/config/linux/libdrm",
-      "//chromeos:chromeos",
+      "//chromeos/dbus",
       "//media/capture/video/chromeos/mojo:cros_camera",
       "//third_party/libsync",
     ]
@@ -281,6 +281,7 @@ jumbo_component("capture_lib") {
     ]
   }
 }
+
 source_set("test_support") {
   testonly = true
 
@@ -392,7 +393,7 @@ test("capture_unittests") {
     ]
     deps += [
       "//build/config/linux/libdrm",
-      "//chromeos:chromeos",
+      "//chromeos/dbus:test_support",
       "//media/capture/video/chromeos/mojo:cros_camera",
       "//mojo/core/embedder",
       "//third_party/libsync",

rlz/BUILD.gn

@@ -92,7 +92,10 @@ if (!is_android) {
       ]
     }
     if (is_chromeos) {
-      deps += [ "//chromeos" ]
+      deps += [
+        "//chromeos",
+        "//chromeos/dbus",
+      ]
     }
 
     if (is_mac) {
@@ -160,7 +163,10 @@ if (!is_android) {
       "//third_party/zlib",
     ]
     if (is_chromeos) {
-      deps += [ "//chromeos" ]
+      deps += [
+        "//chromeos:test_support",
+        "//chromeos/dbus:test_support",
+      ]
     }
   }
 }

services/device/BUILD.gn

@@ -145,8 +145,8 @@ source_set("tests") {
   if (is_chromeos) {
     sources += [ "fingerprint/fingerprint_chromeos_unittest.cc" ]
     deps += [
-      "//chromeos",
-      "//dbus",
+      "//chromeos:test_support",
+      "//chromeos/dbus:test_support",
       "//services/device/bluetooth:bluetooth_system_tests",
       "//services/device/fingerprint",
       "//third_party/protobuf:protobuf_lite",

services/device/battery/BUILD.gn

@@ -42,7 +42,7 @@ if (!is_android) {
     if (is_chromeos) {
       configs += [ "//build/config/linux/dbus" ]
       deps += [
-        "//chromeos:chromeos",
+        "//chromeos/dbus",
         "//chromeos/dbus:power_manager_proto",
       ]
       sources -= [

services/device/fingerprint/BUILD.gn

@@ -25,7 +25,7 @@ component("fingerprint") {
       "fingerprint_chromeos.h",
     ]
     deps += [
-      "//chromeos",
+      "//chromeos/dbus",
       "//dbus",
       "//third_party/protobuf:protobuf_lite",
     ]

services/device/hid/BUILD.gn

@@ -52,7 +52,7 @@ source_set("hid") {
   }
 
   if (is_chromeos) {
-    deps += [ "//chromeos" ]
+    deps += [ "//chromeos/dbus" ]
   }
 
   if (is_win) {

services/device/media_transfer_protocol/BUILD.gn

@@ -38,7 +38,7 @@ source_set("media_transfer_protocol") {
     ":mtp_file_entry_proto",
     ":mtp_storage_info_proto",
     "//base",
-    "//chromeos",
+    "//chromeos/dbus",
     "//dbus",
   ]
 }

services/device/serial/BUILD.gn

@@ -65,10 +65,7 @@ if (is_win || (is_linux && use_udev) || is_mac) {
     }
 
     if (is_chromeos) {
-      deps += [
-        "//chromeos",
-        "//dbus",
-      ]
+      deps += [ "//chromeos/dbus" ]
     }
 
     if (is_mac) {

services/device/wake_lock/power_save_blocker/BUILD.gn

@@ -70,7 +70,7 @@ source_set("power_save_blocker") {
 
   if (is_chromeos) {
     deps += [
-      "//chromeos",
+      "//chromeos/dbus",
       "//chromeos/dbus:power_manager_proto",
     ]
   }

ui/base/BUILD.gn

@@ -515,7 +515,10 @@ jumbo_component("base") {
   }
 
   if (is_chromeos) {
-    deps += [ "//chromeos" ]
+    deps += [
+      "//chromeos",
+      "//chromeos/dbus",
+    ]
     sources -= [ "idle/idle_linux.cc" ]
   }
 

ui/chromeos/BUILD.gn

@@ -29,7 +29,8 @@ component("chromeos") {
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
-    "//chromeos:chromeos",
+    "//chromeos",
+    "//chromeos/dbus",
     "//chromeos/dbus:power_manager_proto",
     "//components/device_event_log",
     "//components/onc",