[DeviceService] Expose battery monitoring solely via the Device Service

services/device/battery/battery_monitor_impl.h

Index: services/device/battery/battery_monitor_impl.h
diff --git a/device/battery/battery_monitor_impl.h b/services/device/battery/battery_monitor_impl.h
similarity index 71%
rename from device/battery/battery_monitor_impl.h
rename to services/device/battery/battery_monitor_impl.h
index 67be418d6854002507d250ecfdc879a370708b2d..1b8d67f46e2e50e2cf1a72c60633c36a255c87ca 100644
--- a/device/battery/battery_monitor_impl.h
+++ b/services/device/battery/battery_monitor_impl.h
@@ -2,23 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_
-#define DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_
+#ifndef SERVICES_DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_
+#define SERVICES_DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
-#include "device/battery/battery_export.h"
-#include "device/battery/battery_monitor.mojom.h"
-#include "device/battery/battery_status_service.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
+#include "services/device/battery/battery_status_service.h"
+#include "services/device/public/interfaces/battery_monitor.mojom.h"
 
 namespace device {
 
 class BatteryMonitorImpl : public mojom::BatteryMonitor {
  public:
-  DEVICE_BATTERY_EXPORT static void Create(
-      mojom::BatteryMonitorRequest request);
+  static void Create(mojom::BatteryMonitorRequest request);
 
   BatteryMonitorImpl();
   ~BatteryMonitorImpl() override;
@@ -43,4 +41,4 @@ class BatteryMonitorImpl : public mojom::BatteryMonitor {
 
 }  // namespace device
 
-#endif  // DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_
+#endif  // SERVICES_DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_