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

device/battery/battery_status_manager_android.h

Index: device/battery/battery_status_manager_android.h
diff --git a/content/browser/battery_status/battery_status_manager_android.h b/device/battery/battery_status_manager_android.h
similarity index 78%
rename from content/browser/battery_status/battery_status_manager_android.h
rename to device/battery/battery_status_manager_android.h
index 02007e7c1ad0b64d7e04dc42cbf6c360386b514e..e0f69ba827df6f7662cc04b055cc15b4cf76a940 100644
--- a/content/browser/battery_status/battery_status_manager_android.h
+++ b/device/battery/battery_status_manager_android.h
@@ -4,12 +4,12 @@
 
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
-#include "content/browser/battery_status/battery_status_manager.h"
+#include "device/battery/battery_status_manager.h"
 
-#ifndef CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_ANDROID_H_
-#define CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_ANDROID_H_
+#ifndef DEVICE_BATTERY_BATTERY_STATUS_MANAGER_ANDROID_H_
+#define DEVICE_BATTERY_BATTERY_STATUS_MANAGER_ANDROID_H_
 
-namespace content {
+namespace device {
 
 class BatteryStatusManagerAndroid : public BatteryStatusManager {
  public:
@@ -40,6 +40,6 @@ class BatteryStatusManagerAndroid : public BatteryStatusManager {
   DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerAndroid);
 };
 
-}  // namespace content
+}  // namespace device
 
-#endif  // CHROME_BROWSER_BATTERY_STATUS_BATTERY_STATUS_MANAGER_ANDROID_H_
+#endif  // DEVICE_BATTERY_BATTERY_STATUS_MANAGER_ANDROID_H_