[DeviceService] Expose battery monitoring solely via the Device Service

services/device/battery/battery_status_service.cc

Index: services/device/battery/battery_status_service.cc
diff --git a/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
similarity index 84%
rename from device/battery/battery_status_service.cc
rename to services/device/battery/battery_status_service.cc
index f33a117dff4a2ca8a73ef6ff1ab154ad0c1bde5a..988f20d2a818c504bea480874505d3caedfea088 100644
--- a/device/battery/battery_status_service.cc
+++ b/services/device/battery/battery_status_service.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_service.h"
+#include "services/device/battery/battery_status_service.h"
 
 #include <utility>
 
@@ -10,8 +10,8 @@
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "device/battery/battery_monitor_impl.h"
-#include "device/battery/battery_status_manager.h"
+#include "services/device/battery/battery_monitor_impl.h"
+#include "services/device/battery/battery_status_manager.h"
 
 namespace device {
 
@@ -21,13 +21,11 @@ BatteryStatusService::BatteryStatusService()
                                   base::Unretained(this))),
       status_updated_(false),
       is_shutdown_(false) {
-  callback_list_.set_removal_callback(
-      base::Bind(&BatteryStatusService::ConsumersChanged,
-                 base::Unretained(this)));
+  callback_list_.set_removal_callback(base::Bind(
+      &BatteryStatusService::ConsumersChanged, base::Unretained(this)));
 }
 
-BatteryStatusService::~BatteryStatusService() {
-}
+BatteryStatusService::~BatteryStatusService() {}
 
 BatteryStatusService* BatteryStatusService::GetInstance() {
   return base::Singleton<
@@ -71,10 +69,9 @@ void BatteryStatusService::ConsumersChanged() {
 void BatteryStatusService::NotifyConsumers(const mojom::BatteryStatus& status) {
   DCHECK(!is_shutdown_);
 
-  main_thread_task_runner_->PostTask(FROM_HERE, base::Bind(
-      &BatteryStatusService::NotifyConsumersOnMainThread,
-      base::Unretained(this),
-      status));
+  main_thread_task_runner_->PostTask(
+      FROM_HERE, base::Bind(&BatteryStatusService::NotifyConsumersOnMainThread,
+                            base::Unretained(this), status));
 }
 
 void BatteryStatusService::NotifyConsumersOnMainThread(