[DeviceService] Expose battery monitoring solely via the Device Service

device/BUILD.gn

Index: device/BUILD.gn
diff --git a/device/BUILD.gn b/device/BUILD.gn
index b9d73b2006eaa46284a3d76b5606026bfcc47773..658c826dc50e12c2e3b2fef71e6ca61b83aa2a8f 100644
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -19,8 +19,6 @@ is_linux_without_udev = is_linux && !use_udev
 test("device_unittests") {
   sources = [
     "base/synchronization/one_writer_seqlock_unittest.cc",
-    "battery/battery_status_manager_win_unittest.cc",
-    "battery/battery_status_service_unittest.cc",
     "bluetooth/bluetooth_adapter_mac_unittest.mm",
     "bluetooth/bluetooth_adapter_unittest.cc",
     "bluetooth/bluetooth_adapter_win_unittest.cc",
@@ -80,8 +78,6 @@ test("device_unittests") {
     "//base/test:test_support",
     "//base/third_party/dynamic_annotations:dynamic_annotations",
     "//device/base/synchronization",
-    "//device/battery",
-    "//device/battery:mojo_bindings",
     "//device/bluetooth",
     "//device/bluetooth:mocks",
     "//device/bluetooth:mojo",
@@ -110,11 +106,6 @@ test("device_unittests") {
     "//url",
   ]
 
-  if (is_linux && !is_chromeos && use_dbus) {
-    sources += [ "battery/battery_status_manager_linux_unittest.cc" ]
-    deps += [ "//dbus:test_support" ]
-  }
-
   if (!is_linux_without_udev) {
     sources +=
         [ "generic_sensor/platform_sensor_and_provider_unittest_linux.cc" ]
@@ -190,7 +181,6 @@ test("device_unittests") {
   }
 
   if (is_android) {
-    sources -= [ "battery/battery_status_service_unittest.cc" ]
     deps += [
       ":bluetooth_test_java",
       ":bluetooth_test_jni_headers",
@@ -199,7 +189,6 @@ test("device_unittests") {
       "//device/sensors:java",
       "//device/usb:java",
     ]
-    deps -= [ "//device/battery" ]
   }
 
   if (is_chromeos) {