Reland "Replace Chrome IPC with Mojo IPC for querying BatteryStatus service"

device/battery/battery_status_manager_linux.h

Index: device/battery/battery_status_manager_linux.h
diff --git a/content/browser/battery_status/battery_status_manager_linux.h b/device/battery/battery_status_manager_linux.h
similarity index 57%
rename from content/browser/battery_status/battery_status_manager_linux.h
rename to device/battery/battery_status_manager_linux.h
index 5bce494743e35b2d025033113aad26d8c6d725c4..7b71a04dc458c7b1b0f6f840c76e36c5d8dfb5aa 100644
--- a/content/browser/battery_status/battery_status_manager_linux.h
+++ b/device/battery/battery_status_manager_linux.h
@@ -1,17 +1,17 @@
 // 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 CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_LINUX_H_
-#define CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_LINUX_H_
+#ifndef DEVICE_BATTERY_BATTERY_STATUS_MANAGER_LINUX_H_
+#define DEVICE_BATTERY_BATTERY_STATUS_MANAGER_LINUX_H_
 
-#include "content/common/content_export.h"
-#include "third_party/WebKit/public/platform/WebBatteryStatus.h"
+#include "device/battery/battery_export.h"
+#include "device/battery/battery_status.mojom.h"
 
 namespace base {
 class DictionaryValue;
 }
 
-namespace content {
+namespace device {
 
 // UPowerDeviceState reflects the possible UPower.Device.State values,
 // see upower.freedesktop.org/docs/Device.html#Device:State.
@@ -25,10 +25,10 @@ enum UPowerDeviceState {
   UPOWER_DEVICE_STATE_PENDING_DISCHARGE = 6,
 };
 
-// Returns the WebBatteryStatus computed using the provided dictionary.
-CONTENT_EXPORT blink::WebBatteryStatus ComputeWebBatteryStatus(
+// Returns the BatteryStatus computed using the provided dictionary.
+DEVICE_BATTERY_EXPORT BatteryStatus ComputeWebBatteryStatus(
     const base::DictionaryValue& dictionary);
 
-}  // namespace content
+}  // namespace device
 
-#endif  // CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_LINUX_H_
+#endif  // DEVICE_BATTERY_BATTERY_STATUS_MANAGER_LINUX_H_