Refactor code listening to platform events in content/renderer/.

content/renderer/battery_status/battery_status_dispatcher_unittest.cc

Index: content/renderer/battery_status/battery_status_dispatcher_unittest.cc
diff --git a/content/renderer/battery_status/battery_status_dispatcher_unittest.cc b/content/renderer/battery_status/battery_status_dispatcher_unittest.cc
index ecbcf393f491db55d089c850320297d214169a99..2479ec305a6ca9d427629e7847c3f0bab320bb29 100644
--- a/content/renderer/battery_status/battery_status_dispatcher_unittest.cc
+++ b/content/renderer/battery_status/battery_status_dispatcher_unittest.cc
@@ -35,53 +35,9 @@ class MockBatteryStatusListener : public blink::WebBatteryStatusListener {
   DISALLOW_COPY_AND_ASSIGN(MockBatteryStatusListener);
 };
 
-class BatteryStatusDispatcherForTesting : public BatteryStatusDispatcher {
- public:
-  BatteryStatusDispatcherForTesting()
-      : BatteryStatusDispatcher(0),
-        start_invoked_(false),
-        stop_invoked_(false) { }
-
-  virtual ~BatteryStatusDispatcherForTesting() { }
-
-  bool start_invoked() const { return start_invoked_; }
-  bool stop_invoked() const { return stop_invoked_; }
-
- protected:
-  virtual bool Start() OVERRIDE {
-    start_invoked_ = true;
-    return true;
-  }
-
-  virtual bool Stop() OVERRIDE {
-    stop_invoked_ = true;
-    return true;
-  }
-
- private:
-  bool start_invoked_;
-  bool stop_invoked_;
-
-  DISALLOW_COPY_AND_ASSIGN(BatteryStatusDispatcherForTesting);
-};
-
-TEST(BatteryStatusDispatcherTest, Start) {
-  MockBatteryStatusListener listener;
-  BatteryStatusDispatcherForTesting dispatcher;
-
-  EXPECT_FALSE(dispatcher.start_invoked());
-  EXPECT_FALSE(dispatcher.stop_invoked());
-
-  dispatcher.SetListener(&listener);
-  EXPECT_TRUE(dispatcher.start_invoked());
-
-  dispatcher.SetListener(0);
-  EXPECT_TRUE(dispatcher.stop_invoked());
-}
-
 TEST(BatteryStatusDispatcherTest, UpdateListener) {
   MockBatteryStatusListener listener;
-  BatteryStatusDispatcherForTesting dispatcher;
+  BatteryStatusDispatcher dispatcher(0);
 
   blink::WebBatteryStatus status;
   status.charging = true;
@@ -89,8 +45,7 @@ TEST(BatteryStatusDispatcherTest, UpdateListener) {
   status.dischargingTime = 200;
   status.level = 0.5;
 
-  dispatcher.SetListener(&listener);
-  EXPECT_TRUE(dispatcher.start_invoked());
+  dispatcher.Start(&listener);
 
   BatteryStatusMsg_DidChange message(status);
   dispatcher.OnControlMessageReceived(message);
@@ -102,17 +57,14 @@ TEST(BatteryStatusDispatcherTest, UpdateListener) {
   EXPECT_EQ(status.dischargingTime, received_status.dischargingTime);
   EXPECT_EQ(status.level, received_status.level);
 
-  dispatcher.SetListener(0);
-  EXPECT_TRUE(dispatcher.stop_invoked());
+  dispatcher.Stop();
 }
 
 TEST(BatteryStatusDispatcherTest, NoUpdateWhenNullListener) {
   MockBatteryStatusListener listener;
-  BatteryStatusDispatcherForTesting dispatcher;
+  BatteryStatusDispatcher dispatcher(0);
 
-  dispatcher.SetListener(0);
-  EXPECT_FALSE(dispatcher.start_invoked());
-  EXPECT_TRUE(dispatcher.stop_invoked());
+  dispatcher.Stop();
 
   blink::WebBatteryStatus status;
   BatteryStatusMsg_DidChange message(status);