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

content/browser/battery_status/battery_monitor_integration_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/callback_list.h"
 #include "base/lazy_instance.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
@@ skipping 32 matching lines @@
   g_callback_list.Get().Notify(battery_status);
 }
 
 class FakeBatteryMonitor : public device::BatteryMonitor {
  public:
   static void Create(mojo::InterfaceRequest<BatteryMonitor> request) {
     new FakeBatteryMonitor(request.Pass());
   }
 
  private:
+  typedef mojo::Callback<void(device::BatteryStatusPtr)> BatteryStatusCallback;
+
   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 QueryNextStatus(const BatteryStatusCallback& callback) override {
+    // We don't expect overlapped calls to QueryNextStatus.
+    DCHECK(callback_.is_null());
+
+    callback_ = callback;
+
+    if (!subscription_) {
+      subscription_ =
+          g_callback_list.Get().Add(base::Bind(&FakeBatteryMonitor::DidChange,
+                                               base::Unretained(this)));
+      // Report initial value.
+      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());
+    if (!callback_.is_null()) {
+      callback_.Run(battery_status.Clone());
+      callback_.reset();
+    }
   }
 
   scoped_ptr<BatteryUpdateSubscription> subscription_;
   mojo::StrongBinding<BatteryMonitor> binding_;
+  BatteryStatusCallback callback_;
 };
 
 // Overrides the default service implementation with the test implementation
 // declared above.
 class TestContentBrowserClient : public ContentBrowserClient {
  public:
   void OverrideRenderProcessMojoServices(ServiceRegistry* registry) override {
     registry->AddService(base::Bind(&FakeBatteryMonitor::Create));
   }
 };
@@ skipping 63 matching lines @@
   TestNavigationObserver same_tab_observer2(shell()->web_contents(), 1);
   status.level = 0.6;
   UpdateBattery(status);
   same_tab_observer2.Wait();
   EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref());
 }
 
 }  //  namespace
 
 }  //  namespace content