gn: simplify dbus logic in device/battery

device/battery/BUILD.gn

Index: device/battery/BUILD.gn
diff --git a/device/battery/BUILD.gn b/device/battery/BUILD.gn
index 17cd64d8ce436418d4c6288717fe174bb188f0c3..ac9cc7249c43f7ea77aa1e33180ffde4d7899de3 100644
--- a/device/battery/BUILD.gn
+++ b/device/battery/BUILD.gn
@@ -36,24 +36,25 @@ if (!is_android) {
       "//third_party/mojo/src/mojo/edk/system",
     ]
 
-    if (is_chromeos) {
-      configs += [ "//build/config/linux:dbus" ]
-      deps += [
-        "//chromeos:chromeos",
-        "//chromeos:power_manager_proto",
-      ]
-      sources -= [
-        "battery_status_manager_default.cc",
-        "battery_status_manager_linux.cc",
-      ]
-    }
+    if (is_linux) {
+      remove_dbus_impl = false
 
-    if (is_desktop_linux) {

[timvolodine, 2016/02/09 13:59:04]

maybe just use "if (is_linux && !is_chromeos) { .. }" instead for readability?

[Mostyn Bramley-Moore, 2016/02/09 21:38:51]

How does patchset 5 look to you?

       if (use_dbus) {
-        configs += [ "//build/config/linux:dbus" ]
         deps += [ "//dbus" ]
         sources -= [ "battery_status_manager_default.cc" ]
       } else {
+        remove_dbus_impl = true
+      }
+
+      if (is_chromeos) {
+        deps += [
+          "//chromeos:chromeos",
+          "//chromeos:power_manager_proto",
+        ]
+        remove_dbus_impl = true
+      }
+
+      if (remove_dbus_impl) {
         sources -= [ "battery_status_manager_linux.cc" ]
       }
     }