Stop using [Client=...] feature of Mojom for BatteryMonitor

content/browser/battery_status/battery_monitor_integration_browsertest.cc

Index: content/browser/battery_status/battery_monitor_integration_browsertest.cc
diff --git a/content/browser/battery_status/battery_monitor_integration_browsertest.cc b/content/browser/battery_status/battery_monitor_integration_browsertest.cc
index 16a819c3c673c0f907b9c9df55dc2775453a6de0..2a59bf21dbfd8a909751c3d219035340d2ac76a2 100644
--- a/content/browser/battery_status/battery_monitor_integration_browsertest.cc
+++ b/content/browser/battery_status/battery_monitor_integration_browsertest.cc
@@ -51,20 +51,23 @@ class FakeBatteryMonitor : public device::BatteryMonitor {
 
  private:
   FakeBatteryMonitor(mojo::InterfaceRequest<BatteryMonitor> request)
-      : subscription_(
-            g_callback_list.Get().Add(base::Bind(&FakeBatteryMonitor::DidChange,
-                                                 base::Unretained(this)))),
-        binding_(this, request.Pass()) {
-    DidChange(g_battery_status);
+        : binding_(this, request.Pass()) {
   }
   ~FakeBatteryMonitor() override {}
 
+  void SetClient(device::BatteryMonitorClientPtr client) override {
+    client_ = client.Pass();
+    subscription_ =
+        g_callback_list.Get().Add(
+            base::Bind(&FakeBatteryMonitor::DidChange, base::Unretained(this)));
+    DidChange(g_battery_status);
+  }
+
   void DidChange(const device::BatteryStatus& battery_status) {
-    device::BatteryStatusPtr status(device::BatteryStatus::New());
-    *status = battery_status;
-    binding_.client()->DidChange(status.Pass());
+    client_->DidChange(battery_status.Clone());
   }
 
+  device::BatteryMonitorClientPtr client_;
   scoped_ptr<BatteryUpdateSubscription> subscription_;
   mojo::StrongBinding<BatteryMonitor> binding_;
 };