Guard dbus component and config with assert(use_dbus)

chrome/test/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_tests.gni")
@@ skipping 1095 matching lines @@
         # inline login UI is disabled on chromeos
         "../browser/ui/webui/signin/inline_login_ui_browsertest.cc",
 
         # chromeos does not use the desktop user manager
         "../browser/ui/webui/signin/user_manager_ui_browsertest.cc",
       ]
       deps += [
         "//chromeos/ime:gencode",
         "//components/arc:arc_test_support",
         "//components/user_manager:test_support",
-        "//dbus",
-        "//dbus:test_support",
         "//ui/login:resources",
       ]
+
+      if (use_dbus) {
+        deps += [
+          "//dbus",

[brettw, 2016/05/31 20:22:37]

You can remove this and just keep test support since you're touching it. The
convention is that the test_support version has a public dep on the
corresponding non-test target (and dbus does) so that only it is necessary.

[mbjorge, 2016/05/31 20:38:39]

Done

+          "//dbus:test_support",
+        ]
+      }
     } else {
       sources -= [
         "../browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc",
         "../browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc",
         "../browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc",
         "../browser/extensions/api/terminal/terminal_private_apitest.cc",
         "../browser/invalidation/profile_invalidation_provider_factory_browsertest.cc",
         "../browser/net/nss_context_chromeos_browsertest.cc",
         "data/webui/certificate_viewer_ui_test-inl.h",
       ]
@@ skipping 907 matching lines @@
       "//chrome/browser:gnome_keyring",
       "//chrome/browser:gnome_keyring_direct",
     ]
   }
   if (is_linux && !is_chromeos) {
     sources +=
         [ "../browser/password_manager/native_backend_libsecret_unittest.cc" ]
     deps += [ "//third_party/libsecret" ]
   }
   if (is_linux && use_aura) {
-    deps += [
-      "//dbus",
-      "//dbus:test_support",
-      "//ui/aura:test_support",
-    ]
+    deps += [ "//ui/aura:test_support" ]
+    if (use_dbus) {
+      deps += [
+        "//dbus",

[brettw, 2016/05/31 20:22:37]

Ditto

[mbjorge, 2016/05/31 20:38:39]

Done

+        "//dbus:test_support",
+      ]
+    }
   }
   if (is_linux && is_chrome_branded && current_cpu == "x86") {
     ldflags = [ "-Wl,--strip-debug" ]
   }
   if (is_mac) {
     sources -= [
       # This tests the function GetSpellCheckLanguages which is not used on
       # Mac.
       "../browser/spellchecker/spellcheck_service_unittest.cc",
       "../browser/ui/tests/ui_gfx_image_unittest.cc",
@@ skipping 321 matching lines @@
 if (is_android) {
   android_library("unit_tests_java") {
     java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_apk/ChromeNativeTestApplication.java" ]
     deps = [
       "//base:base_java",
       "//chrome/android:chrome_java",
       "//content/public/android:content_java",
     ]
   }
 }