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

content/test/layouttest_support.cc

Index: content/test/layouttest_support.cc
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc
index d36e7fc8c60df772818a7384b5581ca29e5a354d..016d459c4cd599b4bf92a0644bfa653f18dd7422 100644
--- a/content/test/layouttest_support.cc
+++ b/content/test/layouttest_support.cc
@@ -9,7 +9,6 @@
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/gpu/image_transport_surface.h"
 #include "content/public/common/page_state.h"
-#include "content/public/renderer/renderer_gamepad_provider.h"
 #include "content/renderer/compositor_bindings/web_layer_impl.h"
 #include "content/renderer/history_entry.h"
 #include "content/renderer/history_serialization.h"
@@ -84,9 +83,7 @@ void EnableWebTestProxyCreation(
 
 void SetMockGamepadProvider(RendererGamepadProvider* provider) {
   RenderThreadImpl::current()->webkit_platform_support()->
-      SetPlatformEventObserverForTesting(
-          blink::WebPlatformEventGamepad,
-          scoped_ptr<PlatformEventObserverBase>(provider));
+      set_gamepad_provider(provider);
 }
 
 void SetMockDeviceLightData(const double data) {
@@ -103,8 +100,7 @@ void SetMockDeviceOrientationData(const WebDeviceOrientationData& data) {
 }
 
 void MockBatteryStatusChanged(const WebBatteryStatus& status) {
-  RenderThreadImpl::current()->webkit_platform_support()->
-    MockBatteryStatusChangedForTesting(status);
+  RendererWebKitPlatformSupportImpl::MockBatteryStatusChangedForTesting(status);
 }
 
 void EnableRendererLayoutTestMode() {