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

content/renderer/battery_status/battery_status_dispatcher.h

Index: content/renderer/battery_status/battery_status_dispatcher.h
diff --git a/content/renderer/battery_status/battery_status_dispatcher.h b/content/renderer/battery_status/battery_status_dispatcher.h
index 57255c0263d4a18608ba66bde3b9845c9c59d5c5..0358fa792d2b097f4fe7a378b0ef010628bcde84 100644
--- a/content/renderer/battery_status/battery_status_dispatcher.h
+++ b/content/renderer/battery_status/battery_status_dispatcher.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_RENDERER_BATTERY_STATUS_BATTERY_STATUS_DISPATCHER_H_
 #define CONTENT_RENDERER_BATTERY_STATUS_BATTERY_STATUS_DISPATCHER_H_
 
-#include "content/public/renderer/platform_event_observer.h"
+#include "content/public/renderer/render_process_observer.h"
 
 namespace blink {
 class WebBatteryStatus;
@@ -15,25 +15,27 @@ class WebBatteryStatusListener;
 namespace content {
 class RenderThread;
 
-class CONTENT_EXPORT BatteryStatusDispatcher
-    : NON_EXPORTED_BASE(
-          public PlatformEventObserver<blink::WebBatteryStatusListener>) {
+class CONTENT_EXPORT BatteryStatusDispatcher : public RenderProcessObserver {
  public:
   explicit BatteryStatusDispatcher(RenderThread* thread);
   virtual ~BatteryStatusDispatcher();
 
-  // PlatformEventObserver public methods.
+  // RenderProcessObserver method.
   virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void SendFakeDataForTesting(void* data) OVERRIDE;
+
+  // Sets the listener to receive battery status updates. Returns true if the
+  // registration was successful.
+  bool SetListener(blink::WebBatteryStatusListener* listener);
 
  protected:
-  // PlatformEventObserver protected methods.
-  virtual void SendStartMessage() OVERRIDE;
-  virtual void SendStopMessage() OVERRIDE;
+  virtual bool Start();
+  virtual bool Stop();
 
  private:
   void OnDidChange(const blink::WebBatteryStatus& status);
 
+  blink::WebBatteryStatusListener* listener_;
+
   DISALLOW_COPY_AND_ASSIGN(BatteryStatusDispatcher);
 };