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

device/battery/battery_status_manager_default.cc

Index: device/battery/battery_status_manager_default.cc
diff --git a/content/browser/battery_status/battery_status_manager_default.cc b/device/battery/battery_status_manager_default.cc
similarity index 89%
rename from content/browser/battery_status/battery_status_manager_default.cc
rename to device/battery/battery_status_manager_default.cc
index d0ff732507644fa4fb8af1d9eef2817d5970a94c..90c6f8196890633fc6d581d1a3d5992558ee196e 100644
--- a/content/browser/battery_status/battery_status_manager_default.cc
+++ b/device/battery/battery_status_manager_default.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/battery_status/battery_status_manager.h"
+#include "device/battery/battery_status_manager.h"
 
 #include "base/logging.h"
 
-namespace content {
+namespace device {
 
 namespace {
 
@@ -37,4 +37,4 @@ scoped_ptr<BatteryStatusManager> BatteryStatusManager::Create(
       new BatteryStatusManagerDefault(callback));
 }
 
-}  // namespace content
+}  // namespace device