gn: simplify dbus logic in device/battery

device/battery/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/features.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
 # On android, BatteryManager mojo service is implemented directly in Java.
 if (!is_android) {
   component("battery") {
@@ skipping 18 matching lines @@
 
     deps = [
       ":mojo_bindings",
       "//base",
       "//base/third_party/dynamic_annotations",
       "//mojo/environment:chromium",
       "//mojo/public/cpp/bindings",
       "//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" ]
       }
     }
 
     if (is_mac) {
       sources -= [ "battery_status_manager_default.cc" ]
     }
 
     if (is_win) {
       sources -= [ "battery_status_manager_default.cc" ]
     }
   }
 }
 
 mojom("mojo_bindings") {
   sources = [
     "battery_monitor.mojom",
     "battery_status.mojom",
   ]
 }