Revert of Generalize and refactor DeviceSensorEvent* architecture to support multi-event type targets.

Source/modules/battery/BatteryDispatcher.h

Index: Source/modules/battery/BatteryDispatcher.h
diff --git a/Source/modules/battery/BatteryDispatcher.h b/Source/modules/battery/BatteryDispatcher.h
index 049963aa619d85601f3d93208345773d68c80a9c..937fafaeff387dda36a7866a8686ae2ecc288d46 100644
--- a/Source/modules/battery/BatteryDispatcher.h
+++ b/Source/modules/battery/BatteryDispatcher.h
@@ -5,7 +5,7 @@
 #ifndef BatteryDispatcher_h
 #define BatteryDispatcher_h
 
-#include "core/frame/DeviceEventDispatcherBase.h"
+#include "core/frame/DeviceSensorEventDispatcher.h"
 #include "modules/battery/BatteryManager.h"
 #include "modules/battery/BatteryStatus.h"
 #include "public/platform/WebBatteryStatusListener.h"
@@ -16,20 +16,22 @@
 
 namespace WebCore {
 
-class BatteryDispatcher FINAL : public DeviceEventDispatcherBase, public blink::WebBatteryStatusListener {
+class BatteryDispatcher FINAL : public DeviceSensorEventDispatcher, public blink::WebBatteryStatusListener {
 public:
     static BatteryDispatcher& instance();
     virtual ~BatteryDispatcher();
 
-    BatteryStatus* latestData();
+    void addClient(BatteryManager*);
+    void removeClient(BatteryManager*);
 
-    // Inherited from blink::WebBatteryStatusListener.
+    const BatteryStatus* getLatestData();
     virtual void updateBatteryStatus(const blink::WebBatteryStatus&) OVERRIDE;
 
 private:
     BatteryDispatcher();
 
-    // Inherited from DeviceEventDispatcherBase.
+    void didChangeBatteryStatus(const AtomicString& eventType);
+
     virtual void startListening() OVERRIDE;
     virtual void stopListening() OVERRIDE;