Migrates battery_status from content/renderer/ to WebKit/platform/

third_party/WebKit/Source/platform/battery/battery_dispatcher_proxy_unittest.cc

Index: third_party/WebKit/Source/platform/battery/battery_dispatcher_proxy_unittest.cc
diff --git a/content/renderer/battery_status/battery_status_dispatcher_unittest.cc b/third_party/WebKit/Source/platform/battery/battery_dispatcher_proxy_unittest.cc
similarity index 42%
rename from content/renderer/battery_status/battery_status_dispatcher_unittest.cc
rename to third_party/WebKit/Source/platform/battery/battery_dispatcher_proxy_unittest.cc
index 5af344546b7959357d5496d463b3f9e8c90abf42..8be50277bee5db32e3453f5eb9a864b1bd4d9c54 100644
--- a/content/renderer/battery_status/battery_status_dispatcher_unittest.cc
+++ b/third_party/WebKit/Source/platform/battery/battery_dispatcher_proxy_unittest.cc
@@ -2,67 +2,61 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/battery_status/battery_status_dispatcher.h"
+#include "platform/battery/battery_dispatcher_proxy.h"
 
-#include <utility>
-
-#include "base/macros.h"
-#include "content/public/test/mock_render_thread.h"
-#include "content/public/test/test_utils.h"
+#include "base/message_loop/message_loop.h"
+#include "platform/battery/battery_status.h"
+#include "platform/battery/battery_status_listener.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/WebBatteryStatusListener.h"
+#include "wtf/Noncopyable.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 
-namespace content {
+namespace blink {
 
-class MockBatteryStatusListener : public blink::WebBatteryStatusListener {
+class MockBatteryStatusListener : public BatteryStatusListener {
+  WTF_MAKE_NONCOPYABLE(MockBatteryStatusListener);
  public:
   MockBatteryStatusListener() : did_change_battery_status_(false) {}
-  ~MockBatteryStatusListener() override {}
 
-  // blink::WebBatteryStatusListener method.
-  void updateBatteryStatus(const blink::WebBatteryStatus& status) override {
+  // BatteryStatusListener method.
+  void OnUpdateBatteryStatus(const BatteryStatus& status) override {
     status_ = status;
     did_change_battery_status_ = true;
   }
 
-  const blink::WebBatteryStatus& status() const { return status_; }
+  const BatteryStatus& status() const { return status_; }
   bool did_change_battery_status() const { return did_change_battery_status_; }
 
  private:
   bool did_change_battery_status_;
-  blink::WebBatteryStatus status_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockBatteryStatusListener);
+  BatteryStatus status_;
 };
 
-class BatteryStatusDispatcherTest : public testing::Test {
+class BatteryDispatcherProxyTest : public testing::Test {
  public:
   void UpdateBatteryStatus(const device::BatteryStatus& status) {
     device::BatteryStatusPtr status_ptr(device::BatteryStatus::New());
     *status_ptr = status;
-    dispatcher_->DidChange(std::move(status_ptr));
+    dispatcher_->OnDidChange(std::move(status_ptr));
   }
 
-  const MockBatteryStatusListener& listener() const {
-    return listener_;
-  }
+  const MockBatteryStatusListener& listener() const { return listener_; }
 
  protected:
   void SetUp() override {
-    dispatcher_.reset(new BatteryStatusDispatcher(&listener_));
+    dispatcher_ = adoptPtr(new BatteryDispatcherProxy(&listener_));
   }
 
  private:
-  // We need to create a MockRenderThread so RenderThread::Get() doesn't return
-  // null.
-  MockRenderThread render_thread_;
+  base::MessageLoop message_loop_;  // Mojo needs the message loop.

[haraken, 2016/02/15 13:18:39]

Hmm. If possible, I don't want to expose base::MessageLoop to platform/. Would
it be possible to create some testing helper in platform/testing/ so that
base::MessageLoop is allowed only in platform/testing/?

[Yuki, 2016/02/16 07:31:58]

Done.

   MockBatteryStatusListener listener_;
-  scoped_ptr<BatteryStatusDispatcher> dispatcher_;
+  OwnPtr<BatteryDispatcherProxy> dispatcher_;
 };
 
-TEST_F(BatteryStatusDispatcherTest, UpdateListener) {
+TEST_F(BatteryDispatcherProxyTest, UpdateListener) {
   // TODO(darin): This test isn't super interesting. It just exercises
-  // conversion b/w device::BatteryStatus and blink::WebBatteryStatus.
+  // conversion b/w device::BatteryStatus and blink::BatteryStatus.
 
   device::BatteryStatus status;
   status.charging = true;
@@ -72,12 +66,12 @@ TEST_F(BatteryStatusDispatcherTest, UpdateListener) {
 
   UpdateBatteryStatus(status);
 
-  const blink::WebBatteryStatus& received_status = listener().status();
+  const BatteryStatus& received_status = listener().status();
   EXPECT_TRUE(listener().did_change_battery_status());
-  EXPECT_EQ(status.charging, received_status.charging);
-  EXPECT_EQ(status.charging_time, received_status.chargingTime);
-  EXPECT_EQ(status.discharging_time, received_status.dischargingTime);
-  EXPECT_EQ(status.level, received_status.level);
+  EXPECT_EQ(status.charging, received_status.charging());
+  EXPECT_EQ(status.charging_time, received_status.charging_time());
+  EXPECT_EQ(status.discharging_time, received_status.discharging_time());
+  EXPECT_EQ(status.level, received_status.level());
 }
 
-}  // namespace content
+}  // namespace blink