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

device/battery/battery_status_manager_linux.cc

Index: device/battery/battery_status_manager_linux.cc
diff --git a/content/browser/battery_status/battery_status_manager_linux.cc b/device/battery/battery_status_manager_linux.cc
similarity index 91%
rename from content/browser/battery_status/battery_status_manager_linux.cc
rename to device/battery/battery_status_manager_linux.cc
index c3cf6da0c4cd81a7d0d46b649d8aff7dc9aa58ff..e6cd4fa8746f16abb4cee8337bd1377d0091ad1f 100644
--- a/content/browser/battery_status/battery_status_manager_linux.cc
+++ b/device/battery/battery_status_manager_linux.cc
@@ -2,22 +2,21 @@
 // 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_linux.h"
+#include "device/battery/battery_status_manager_linux.h"
 
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
-#include "content/browser/battery_status/battery_status_manager.h"
-#include "content/public/browser/browser_thread.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "dbus/property.h"
 #include "dbus/values_util.h"
+#include "device/battery/battery_status_manager.h"
 
-namespace content {
+namespace device {
 
 namespace {
 
@@ -113,8 +112,6 @@ class BatteryStatusNotificationThread : public base::Thread {
         battery_proxy_(NULL) {}
 
   virtual ~BatteryStatusNotificationThread() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
     // Make sure to shutdown the dbus connection if it is still open in the very
     // end. It needs to happen on the BatteryStatusNotificationThread.
     message_loop()->PostTask(
@@ -175,7 +172,7 @@ class BatteryStatusNotificationThread : public base::Thread {
     UpdateNumberBatteriesHistogram(num_batteries);
 
     if (!battery_proxy_) {
-      callback_.Run(blink::WebBatteryStatus());
+      callback_.Run(BatteryStatus());
       return;
     }
 
@@ -240,7 +237,7 @@ class BatteryStatusNotificationThread : public base::Thread {
     } else {
       // Failed to register for "Changed" signal, execute callback with the
       // default values.
-      callback_.Run(blink::WebBatteryStatus());
+      callback_.Run(BatteryStatus());
     }
   }
 
@@ -255,7 +252,7 @@ class BatteryStatusNotificationThread : public base::Thread {
     if (dictionary)
       callback_.Run(ComputeWebBatteryStatus(*dictionary));
     else
-      callback_.Run(blink::WebBatteryStatus());
+      callback_.Run(BatteryStatus());
   }
 
   BatteryStatusService::BatteryUpdateCallback callback_;
@@ -265,8 +262,7 @@ class BatteryStatusNotificationThread : public base::Thread {
   DISALLOW_COPY_AND_ASSIGN(BatteryStatusNotificationThread);
 };
 
-// Runs on IO thread and creates a notification thread and delegates Start/Stop
-// calls to it.
+// Creates a notification thread and delegates Start/Stop calls to it.
 class BatteryStatusManagerLinux : public BatteryStatusManager {
  public:
   explicit BatteryStatusManagerLinux(
@@ -278,9 +274,6 @@ class BatteryStatusManagerLinux : public BatteryStatusManager {
  private:
   // BatteryStatusManager:
   virtual bool StartListeningBatteryChange() override {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-    if (!StartNotifierThreadIfNecessary())
       return false;
 
     notifier_thread_->message_loop()->PostTask(
@@ -291,8 +284,6 @@ class BatteryStatusManagerLinux : public BatteryStatusManager {
   }
 
   virtual void StopListeningBatteryChange() override {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
     if (!notifier_thread_)
       return;
 
@@ -327,9 +318,8 @@ class BatteryStatusManagerLinux : public BatteryStatusManager {
 
 }  // namespace
 
-blink::WebBatteryStatus ComputeWebBatteryStatus(
-    const base::DictionaryValue& dictionary) {
-  blink::WebBatteryStatus status;
+BatteryStatus ComputeWebBatteryStatus(const base::DictionaryValue& dictionary) {
+  BatteryStatus status;
   if (!dictionary.HasKey("State"))
     return status;
 
@@ -349,7 +339,7 @@ blink::WebBatteryStatus ComputeWebBatteryStatus(
   switch (state) {
     case UPOWER_DEVICE_STATE_CHARGING : {
       double time_to_full = GetPropertyAsDouble(dictionary, "TimeToFull", 0);
-      status.chargingTime =
+      status.charging_time =
           (time_to_full > 0) ? time_to_full
                              : std::numeric_limits<double>::infinity();
       break;
@@ -359,15 +349,15 @@ blink::WebBatteryStatus ComputeWebBatteryStatus(
       // Set dischargingTime if it's available. Otherwise leave the default
       // value which is +infinity.
       if (time_to_empty > 0)
-        status.dischargingTime = time_to_empty;
-      status.chargingTime = std::numeric_limits<double>::infinity();
+        status.discharging_time = time_to_empty;
+      status.charging_time = std::numeric_limits<double>::infinity();
       break;
     }
     case UPOWER_DEVICE_STATE_FULL : {
       break;
     }
     default: {
-      status.chargingTime = std::numeric_limits<double>::infinity();
+      status.charging_time = std::numeric_limits<double>::infinity();
     }
   }
   return status;
@@ -380,4 +370,4 @@ scoped_ptr<BatteryStatusManager> BatteryStatusManager::Create(
       new BatteryStatusManagerLinux(callback));
 }
 
-}  // namespace content
+}  // namespace device