[DeviceService] Expose battery monitoring solely via the Device Service

services/device/battery/battery_status_manager_linux.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_MANAGER_LINUX_H_
-#define DEVICE_BATTERY_BATTERY_STATUS_MANAGER_LINUX_H_
+#ifndef SERVICES_DEVICE_BATTERY_BATTERY_STATUS_MANAGER_LINUX_H_
+#define SERVICES_DEVICE_BATTERY_BATTERY_STATUS_MANAGER_LINUX_H_
 
-#include "device/battery/battery_export.h"
-#include "device/battery/battery_status.mojom.h"
-#include "device/battery/battery_status_manager.h"
+#include "services/device/battery/battery_status_manager.h"
+#include "services/device/public/interfaces/battery_status.mojom.h"
 
 namespace dbus {
 class Bus;
 }  // namespace dbus
 
 namespace device {
 // UPowerDeviceState reflects the possible UPower.Device.State values,
 // see upower.freedesktop.org/docs/Device.html#Device:State.
 enum UPowerDeviceState {
   UPOWER_DEVICE_STATE_UNKNOWN = 0,
@@ skipping 13 matching lines @@
   UPOWER_DEVICE_TYPE_BATTERY = 2,
   UPOWER_DEVICE_TYPE_UPS = 3,
   UPOWER_DEVICE_TYPE_MONITOR = 4,
   UPOWER_DEVICE_TYPE_MOUSE = 5,
   UPOWER_DEVICE_TYPE_KEYBOARD = 6,
   UPOWER_DEVICE_TYPE_PDA = 7,
   UPOWER_DEVICE_TYPE_PHONE = 8,
 };
 
 // Creates a notification thread and delegates Start/Stop calls to it.
-class DEVICE_BATTERY_EXPORT BatteryStatusManagerLinux
-    : public BatteryStatusManager {
+class BatteryStatusManagerLinux : public BatteryStatusManager {
  public:
   explicit BatteryStatusManagerLinux(
       const BatteryStatusService::BatteryUpdateCallback& callback);
   ~BatteryStatusManagerLinux() override;
 
  private:
   friend class BatteryStatusManagerLinuxTest;
   class BatteryStatusNotificationThread;
 
   // BatteryStatusManager:
@@ skipping 10 matching lines @@
       dbus::Bus* bus);
 
   BatteryStatusService::BatteryUpdateCallback callback_;
   std::unique_ptr<BatteryStatusNotificationThread> notifier_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerLinux);
 };
 
 }  // namespace device
 
-#endif  // DEVICE_BATTERY_BATTERY_STATUS_MANAGER_LINUX_H_
+#endif  // SERVICES_DEVICE_BATTERY_BATTERY_STATUS_MANAGER_LINUX_H_