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

content/renderer/device_sensors/device_light_event_pump.h

 // 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.
 
 #ifndef CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_LIGHT_EVENT_PUMP_H_
 #define CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_LIGHT_EVENT_PUMP_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "content/common/device_sensors/device_light_data.h"
 #include "content/renderer/device_sensors/device_sensor_event_pump.h"
 #include "content/renderer/shared_memory_seqlock_reader.h"
 
 namespace blink {
 class WebDeviceLightListener;
 }
 
 namespace content {
 
 typedef SharedMemorySeqLockReader<DeviceLightData>
     DeviceLightSharedMemoryReader;
 
-class CONTENT_EXPORT DeviceLightEventPump
-    : public DeviceSensorEventPump<blink::WebDeviceLightListener> {
+class CONTENT_EXPORT DeviceLightEventPump : public DeviceSensorEventPump {
  public:
-  explicit DeviceLightEventPump(RenderThread* thread);
+  DeviceLightEventPump();
+  explicit DeviceLightEventPump(int pump_delay_millis);
   virtual ~DeviceLightEventPump();
 
   // Sets the listener to receive updates for device light data at
   // regular intervals. Returns true if the registration was successful.
   bool SetListener(blink::WebDeviceLightListener* listener);
 
-  // PlatformEventObserver implementation.
+  // RenderProcessObserver implementation.
   virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void SendFakeDataForTesting(void* data) OVERRIDE;
 
  protected:
   // Methods overriden from base class DeviceSensorEventPump
   virtual void FireEvent() OVERRIDE;
   virtual bool InitializeReader(base::SharedMemoryHandle handle) OVERRIDE;
+  virtual bool SendStartMessage() OVERRIDE;
+  virtual bool SendStopMessage() OVERRIDE;
 
-  // PlatformEventObserver implementation.
-  virtual void SendStartMessage() OVERRIDE;
-  virtual void SendStopMessage() OVERRIDE;
-
+  blink::WebDeviceLightListener* listener_;
   scoped_ptr<DeviceLightSharedMemoryReader> reader_;
   double last_seen_data_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceLightEventPump);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_LIGHT_EVENT_PUMP_H_