[DeviceService] Expose battery monitoring solely via the Device Service

services/device/battery/battery_status_manager_linux.cc

Index: services/device/battery/battery_status_manager_linux.cc
diff --git a/device/battery/battery_status_manager_linux.cc b/services/device/battery/battery_status_manager_linux.cc
similarity index 98%
rename from device/battery/battery_status_manager_linux.cc
rename to services/device/battery/battery_status_manager_linux.cc
index 0fd085949b680e801f3831580cebe9443a009cc3..0448499e375daf8333a183251564f7764e1da381 100644
--- a/device/battery/battery_status_manager_linux.cc
+++ b/services/device/battery/battery_status_manager_linux.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "device/battery/battery_status_manager_linux.h"
+#include "services/device/battery/battery_status_manager_linux.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -25,7 +25,7 @@
 #include "dbus/object_proxy.h"
 #include "dbus/property.h"
 #include "dbus/values_util.h"
-#include "device/battery/battery_status_manager_linux-inl.h"
+#include "services/device/battery/battery_status_manager_linux-inl.h"
 
 namespace device {
 namespace {
@@ -127,8 +127,8 @@ dbus::ObjectPath UPowerObject::GetDisplayDevice() {
 }
 
 void UpdateNumberBatteriesHistogram(int count) {
-  UMA_HISTOGRAM_CUSTOM_COUNTS(
-      "BatteryStatus.NumberBatteriesLinux", count, 1, 5, 6);
+  UMA_HISTOGRAM_CUSTOM_COUNTS("BatteryStatus.NumberBatteriesLinux", count, 1, 5,
+                              6);
 }
 
 class BatteryProperties : public dbus::PropertySet {
@@ -360,9 +360,7 @@ class BatteryStatusManagerLinux::BatteryStatusNotificationThread
   void SetDBusForTesting(dbus::Bus* bus) { system_bus_ = bus; }
 
  private:
-  bool OnWatcherThread() {
-    return task_runner()->BelongsToCurrentThread();
-  }
+  bool OnWatcherThread() { return task_runner()->BelongsToCurrentThread(); }
 
   void InitDBus() {
     DCHECK(OnWatcherThread());
@@ -376,7 +374,7 @@ class BatteryStatusManagerLinux::BatteryStatusNotificationThread
   bool IsDaemonVersionBelow_0_99() {
     base::Version daemon_version = upower_->properties()->daemon_version();
     return daemon_version.IsValid() &&
-        daemon_version.CompareTo(base::Version("0.99")) < 0;
+           daemon_version.CompareTo(base::Version("0.99")) < 0;
   }
 
   void FindBatteryDevice() {