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

content/renderer/device_sensors/device_motion_event_pump_unittest.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 "device_motion_event_pump.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "content/common/device_sensors/device_motion_hardware_buffer.h"
@@ skipping 25 matching lines @@
 
  private:
   bool did_change_device_motion_;
   blink::WebDeviceMotionData data_;
 
   DISALLOW_COPY_AND_ASSIGN(MockDeviceMotionListener);
 };
 
 class DeviceMotionEventPumpForTesting : public DeviceMotionEventPump {
  public:
-  DeviceMotionEventPumpForTesting()
-      : DeviceMotionEventPump(0) { }
+  DeviceMotionEventPumpForTesting() { }
   virtual ~DeviceMotionEventPumpForTesting() { }
 
   void OnDidStart(base::SharedMemoryHandle renderer_handle) {
     DeviceMotionEventPump::OnDidStart(renderer_handle);
   }
-  virtual void SendStartMessage() OVERRIDE { }
-  virtual void SendStopMessage() OVERRIDE { }
+  virtual bool SendStartMessage() OVERRIDE { return true; }
+  virtual bool SendStopMessage() OVERRIDE { return true; }
   virtual void FireEvent() OVERRIDE {
     DeviceMotionEventPump::FireEvent();
     Stop();
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceMotionEventPumpForTesting);
 };
 
@@ skipping 39 matching lines @@
   DeviceMotionHardwareBuffer* buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceMotionEventPumpTest);
 };
 
 TEST_F(DeviceMotionEventPumpTest, DidStartPolling) {
   base::MessageLoopForUI loop;
 
   InitBuffer(true);
 
-  motion_pump()->Start(listener());
+  motion_pump()->SetListener(listener());
   motion_pump()->OnDidStart(handle());
 
   base::MessageLoop::current()->Run();
 
   const blink::WebDeviceMotionData& received_data = listener()->data();
   EXPECT_TRUE(listener()->did_change_device_motion());
   EXPECT_TRUE(received_data.hasAccelerationX);
   EXPECT_EQ(1, static_cast<double>(received_data.accelerationX));
   EXPECT_TRUE(received_data.hasAccelerationX);
   EXPECT_EQ(2, static_cast<double>(received_data.accelerationY));
   EXPECT_TRUE(received_data.hasAccelerationY);
   EXPECT_EQ(3, static_cast<double>(received_data.accelerationZ));
   EXPECT_TRUE(received_data.hasAccelerationZ);
   EXPECT_FALSE(received_data.hasAccelerationIncludingGravityX);
   EXPECT_FALSE(received_data.hasAccelerationIncludingGravityY);
   EXPECT_FALSE(received_data.hasAccelerationIncludingGravityZ);
   EXPECT_FALSE(received_data.hasRotationRateAlpha);
   EXPECT_FALSE(received_data.hasRotationRateBeta);
   EXPECT_FALSE(received_data.hasRotationRateGamma);
 }
 
 TEST_F(DeviceMotionEventPumpTest, DidStartPollingNotAllSensorsActive) {
   base::MessageLoopForUI loop;
 
   InitBuffer(false);
 
-  motion_pump()->Start(listener());
+  motion_pump()->SetListener(listener());
   motion_pump()->OnDidStart(handle());
 
   base::MessageLoop::current()->Run();
 
   const blink::WebDeviceMotionData& received_data = listener()->data();
   // No change in device motion because allAvailableSensorsAreActive is false.
   EXPECT_FALSE(listener()->did_change_device_motion());
   EXPECT_FALSE(received_data.hasAccelerationX);
   EXPECT_FALSE(received_data.hasAccelerationX);
   EXPECT_FALSE(received_data.hasAccelerationY);
   EXPECT_FALSE(received_data.hasAccelerationZ);
   EXPECT_FALSE(received_data.hasAccelerationIncludingGravityX);
   EXPECT_FALSE(received_data.hasAccelerationIncludingGravityY);
   EXPECT_FALSE(received_data.hasAccelerationIncludingGravityZ);
   EXPECT_FALSE(received_data.hasRotationRateAlpha);
   EXPECT_FALSE(received_data.hasRotationRateBeta);
   EXPECT_FALSE(received_data.hasRotationRateGamma);
 }
 
 }  // namespace content