[DeviceService] Expose battery monitoring solely via the Device Service

services/device/BUILD.gn

 # Copyright 2016 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("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
 source_set("lib") {
   # This should be visible only to embedders of the Device Service, and the
   # dependence should only be for the purpose of embedding the Device Service.
   visibility = [
     ":test_support",
     "//content/browser",
   ]
   sources = [
     "device_service.cc",
     "device_service.h",
   ]
 
   deps = [
     "//base",
-    "//device/battery:mojo_bindings",
     "//device/generic_sensor",
     "//device/sensors",
     "//device/sensors/public/interfaces",
     "//device/wake_lock",
     "//services/device/fingerprint",
     "//services/device/power_monitor",
     "//services/device/public/cpp:device_features",
     "//services/device/public/interfaces",
     "//services/device/screen_orientation",
     "//services/device/time_zone_monitor",
     "//services/service_manager/public/cpp",
     "//ui/gfx",
   ]
 
   if (is_android) {
     sources += [
       "//services/device/android/register_jni.cc",
       "//services/device/android/register_jni.h",
     ]
     deps += [ ":device_service_jni_headers" ]
   } else {
     deps += [
-      "//device/battery",
+      "//services/device/battery",
       "//services/device/vibration",
     ]
   }
 }
 
 source_set("tests") {
   testonly = true
 
   sources = [
+    "battery/battery_status_manager_win_unittest.cc",
+    "battery/battery_status_service_unittest.cc",
     "power_monitor/power_monitor_message_broadcaster_unittest.cc",
     "public/cpp/power_monitor/power_monitor_broadcast_source_unittest.cc",
     "vibration/vibration_manager_impl_unittest.cc",
   ]
 
   deps = [
     ":test_support",
     "//base",
     "//base/test:test_support",
     "//mojo/public/cpp/bindings",
     "//services/device/power_monitor",
     "//services/device/public/cpp/power_monitor",
+    "//testing/gmock",
     "//testing/gtest",
   ]
 
+  if (is_linux && !is_chromeos && use_dbus) {
+    sources += [ "battery/battery_status_manager_linux_unittest.cc" ]
+    deps += [ "//dbus:test_support" ]
+  }
+
   if (is_chromeos) {
     sources += [ "fingerprint/fingerprint_chromeos_unittest.cc" ]
     deps += [
       "//chromeos",
       "//dbus",
       "//services/device/fingerprint",
     ]
   }
 
   if (is_android) {
-    deps += [ "//services/device/vibration/android:vibration_jni_headers" ]
+    sources -= [ "battery/battery_status_service_unittest.cc" ]
+    deps += [
+      ":device_service_jni_headers",
+      "//services/device/vibration/android:vibration_jni_headers",
+    ]
   } else {
     sources += [ "battery/battery_monitor_impl_unittest.cc" ]
     deps += [
-      "//device/battery",
-      "//device/battery:mojo_bindings",
+      "//services/device/battery",
       "//services/device/vibration",
     ]
   }
 }
 
 service_manifest("manifest") {
   name = "device"
   source = "manifest.json"
 }
 
@@ skipping 43 matching lines @@
     # targets which also need to see this target as well.
     # //services:* identifies //services:service_unittests and all of its
     # generated targets.
     visibility = [
       "//content/public/android:*",
       "//services:*",
     ]
     java_files = [ "android/java/src/org/chromium/services/device/InterfaceRegistrar.java" ]
     deps = [
       "//base:base_java",
-      "//device/battery:mojo_bindings_java",
-      "//device/battery/android:battery_monitor_java",
       "//mojo/android:system_java",
       "//mojo/public/java:bindings_java",
       "//mojo/public/java:system_java",
+      "//services/device/battery/android:battery_monitor_java",
       "//services/device/public/interfaces:interfaces_java",
       "//services/device/screen_orientation:java",
       "//services/device/time_zone_monitor:java",
       "//services/device/vibration/android:vibration_manager_java",
       "//services/service_manager/public/interfaces:interfaces_java",
       "//services/service_manager/public/java:service_manager_java",
     ]
   }
 }