[DeviceService] Expose battery monitoring solely via the Device Service

services/device/battery/battery_status_service.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_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;
 }
 
 namespace device {
 class BatteryStatusManager;
 
-class DEVICE_BATTERY_EXPORT BatteryStatusService {
+class BatteryStatusService {
  public:
   typedef base::Callback<void(const mojom::BatteryStatus&)>
       BatteryUpdateCallback;
   typedef base::CallbackList<void(const mojom::BatteryStatus&)>
       BatteryUpdateCallbackList;
   typedef BatteryUpdateCallbackList::Subscription BatteryUpdateSubscription;
 
   // Returns the BatteryStatusService singleton.
   static BatteryStatusService* GetInstance();
 
@@ skipping 32 matching lines @@
   BatteryUpdateCallback update_callback_;
   mojom::BatteryStatus status_;
   bool status_updated_;
   bool is_shutdown_;
 
   DISALLOW_COPY_AND_ASSIGN(BatteryStatusService);
 };
 
 }  // namespace device
 
-#endif  // DEVICE_BATTERY_BATTERY_STATUS_SERVICE_H_
+#endif  // SERVICES_DEVICE_BATTERY_BATTERY_STATUS_SERVICE_H_