[DeviceService] Expose battery monitoring solely via the Device Service

services/device/battery/battery_monitor_impl.h

 // Copyright 2014 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.
 
-#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;
 
  private:
   // mojom::BatteryMonitor methods:
   void QueryNextStatus(const QueryNextStatusCallback& callback) override;
 
   void RegisterSubscription();
   void DidChange(const mojom::BatteryStatus& battery_status);
   void ReportStatus();
 
   mojo::StrongBindingPtr<mojom::BatteryMonitor> binding_;
   std::unique_ptr<BatteryStatusService::BatteryUpdateSubscription>
       subscription_;
   QueryNextStatusCallback callback_;
   mojom::BatteryStatus status_;
   bool status_to_report_;
 
   DISALLOW_COPY_AND_ASSIGN(BatteryMonitorImpl);
 };
 
 }  // namespace device
 
-#endif  // DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_
+#endif  // SERVICES_DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_