[DeviceService] Expose battery monitoring solely via the Device Service

services/device/battery/battery_status_service.h

Index: services/device/battery/battery_status_service.h
diff --git a/device/battery/battery_status_service.h b/services/device/battery/battery_status_service.h
similarity index 88%
rename from device/battery/battery_status_service.h
rename to services/device/battery/battery_status_service.h
index bcdfd4becd4571e70f7ce66503526aaa3f9d56fb..1712b384793d081ff7d07a63ae3d07c1bcd86344 100644
--- a/device/battery/battery_status_service.h
+++ b/services/device/battery/battery_status_service.h
@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DEVICE_BATTERY_BATTERY_STATUS_SERVICE_H_
-#define DEVICE_BATTERY_BATTERY_STATUS_SERVICE_H_
+#ifndef SERVICES_DEVICE_BATTERY_BATTERY_STATUS_SERVICE_H_
+#define SERVICES_DEVICE_BATTERY_BATTERY_STATUS_SERVICE_H_
 
 #include <memory>
 
 #include "base/callback_list.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
-#include "device/battery/battery_export.h"
-#include "device/battery/battery_status.mojom.h"
+#include "services/device/public/interfaces/battery_status.mojom.h"
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -20,7 +19,7 @@ class SingleThreadTaskRunner;
 namespace device {
 class BatteryStatusManager;
 
-class DEVICE_BATTERY_EXPORT BatteryStatusService {
+class BatteryStatusService {
  public:
   typedef base::Callback<void(const mojom::BatteryStatus&)>
       BatteryUpdateCallback;
@@ -73,4 +72,4 @@ class DEVICE_BATTERY_EXPORT BatteryStatusService {
 
 }  // namespace device
 
-#endif  // DEVICE_BATTERY_BATTERY_STATUS_SERVICE_H_
+#endif  // SERVICES_DEVICE_BATTERY_BATTERY_STATUS_SERVICE_H_