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

content/renderer/battery_status/battery_status_dispatcher.cc

Index: content/renderer/battery_status/battery_status_dispatcher.cc
diff --git a/content/renderer/battery_status/battery_status_dispatcher.cc b/content/renderer/battery_status/battery_status_dispatcher.cc
index 3f260ed0ab9e8f5bdd2c57d353d266da2108c656..e7496113d7edd18bc6b9cb7199d605ba21da6af4 100644
--- a/content/renderer/battery_status/battery_status_dispatcher.cc
+++ b/content/renderer/battery_status/battery_status_dispatcher.cc
@@ -2,48 +2,35 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "battery_status_dispatcher.h"
+#include "content/renderer/battery_status/battery_status_dispatcher.h"
 
-#include "content/common/battery_status_messages.h"
-#include "content/renderer/render_thread_impl.h"
+#include "content/public/common/service_registry.h"
+#include "content/public/renderer/render_thread.h"
 #include "third_party/WebKit/public/platform/WebBatteryStatusListener.h"
 
 namespace content {
 
-BatteryStatusDispatcher::BatteryStatusDispatcher(RenderThread* thread)
-    : PlatformEventObserver<blink::WebBatteryStatusListener>(thread) {
-}
+BatteryStatusDispatcher::BatteryStatusDispatcher(
+    blink::WebBatteryStatusListener* listener)
+    : listener_(listener) {
+  DCHECK(listener_);
 
-BatteryStatusDispatcher::~BatteryStatusDispatcher() {
-  StopIfObserving();
+  RenderThread::Get()->GetServiceRegistry()->ConnectToRemoteService(&monitor_);
+  monitor_.set_client(this);
 }
 
-bool BatteryStatusDispatcher::OnControlMessageReceived(
-    const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(BatteryStatusDispatcher, message)
-    IPC_MESSAGE_HANDLER(BatteryStatusMsg_DidChange, OnDidChange)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
-void BatteryStatusDispatcher::SendStartMessage() {
-  RenderThread::Get()->Send(new BatteryStatusHostMsg_Start());
-}
-
-void BatteryStatusDispatcher::SendStopMessage() {
-  RenderThread::Get()->Send(new BatteryStatusHostMsg_Stop());
-}
-
-void BatteryStatusDispatcher::OnDidChange(
-    const blink::WebBatteryStatus& status) {
-  if (listener())
-    listener()->updateBatteryStatus(status);
+BatteryStatusDispatcher::~BatteryStatusDispatcher() {
 }
 
-void BatteryStatusDispatcher::SendFakeDataForTesting(void* fake_data) {
-  OnDidChange(*static_cast<blink::WebBatteryStatus*>(fake_data));
+void BatteryStatusDispatcher::DidChange(
+    device::BatteryStatusPtr battery_status) {
+  DCHECK(battery_status);
+  blink::WebBatteryStatus web_battery_status;
+  web_battery_status.charging = battery_status->charging;
+  web_battery_status.chargingTime = battery_status->charging_time;
+  web_battery_status.dischargingTime = battery_status->discharging_time;
+  web_battery_status.level = battery_status->level;
+  listener_->updateBatteryStatus(web_battery_status);
 }
 
 }  // namespace content