[DeviceService] Expose battery monitoring solely via the Device Service

services/device/battery/battery_status_manager_win.h

Index: services/device/battery/battery_status_manager_win.h
diff --git a/device/battery/battery_status_manager_win.h b/services/device/battery/battery_status_manager_win.h
similarity index 60%
rename from device/battery/battery_status_manager_win.h
rename to services/device/battery/battery_status_manager_win.h
index cb53f1cc6cf482147c1e9c949b12f13da37f5e3a..ca34ad3a0490c646393d9878b4ca4305c3559ca2 100644
--- a/device/battery/battery_status_manager_win.h
+++ b/services/device/battery/battery_status_manager_win.h
@@ -2,12 +2,11 @@
 // 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_WIN_H_
-#define DEVICE_BATTERY_BATTERY_STATUS_MANAGER_WIN_H_
+#ifndef SERVICES_DEVICE_BATTERY_BATTERY_STATUS_MANAGER_WIN_H_
+#define SERVICES_DEVICE_BATTERY_BATTERY_STATUS_MANAGER_WIN_H_
 
 #include <windows.h>
-#include "device/battery/battery_export.h"
-#include "device/battery/battery_status.mojom.h"
+#include "services/device/public/interfaces/battery_status.mojom.h"
 
 namespace device {
 
@@ -18,9 +17,9 @@ enum WinACLineStatus {
 };
 
 // Returns WebBatteryStatus corresponding to the given SYSTEM_POWER_STATUS.
-DEVICE_BATTERY_EXPORT mojom::BatteryStatus ComputeWebBatteryStatus(

[timvolodine, 2017/05/02 18:19:04]

is the DEVICE_BATTERY_EXPORT not needed anymore?

[leonhsl(Using Gerrit), 2017/05/03 03:07:02]

Yeah, it's only for component build and now battery target is not a component
but just a source_set.

+mojom::BatteryStatus ComputeWebBatteryStatus(
     const SYSTEM_POWER_STATUS& win_status);
 
 }  // namespace device
 
-#endif  // DEVICE_BATTERY_BATTERY_STATUS_MANAGER_WIN_H_
+#endif  // SERVICES_DEVICE_BATTERY_BATTERY_STATUS_MANAGER_WIN_H_