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 b2effb529e1a0abc0f3cf3c51d790f9afffc473f..13a981e5dc3ae1947c0518715d5577fcb1b4ee6c 100644
--- a/content/test/layouttest_support.cc
+++ b/content/test/layouttest_support.cc
@@ -10,6 +10,7 @@
 #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/history_entry.h"
 #include "content/renderer/history_serialization.h"
 #include "content/renderer/render_frame_impl.h"
@@ -81,9 +82,11 @@ void EnableWebTestProxyCreation(
   RenderFrameImpl::InstallCreateHook(CreateWebFrameTestProxy);
 }
 
-void SetMockGamepadProvider(RendererGamepadProvider* provider) {
+void SetMockGamepadProvider(scoped_ptr<RendererGamepadProvider> provider) {
   RenderThreadImpl::current()->webkit_platform_support()->
-      set_gamepad_provider(provider);
+      SetPlatformEventObserverForTesting(
+          blink::WebPlatformEventGamepad,
+          provider.PassAs<PlatformEventObserverBase>());
 }
 
 void SetMockDeviceLightData(const double data) {
@@ -100,7 +103,8 @@ void SetMockDeviceOrientationData(const WebDeviceOrientationData& data) {
 }
 
 void MockBatteryStatusChanged(const WebBatteryStatus& status) {
-  RendererWebKitPlatformSupportImpl::MockBatteryStatusChangedForTesting(status);
+  RenderThreadImpl::current()->webkit_platform_support()->
+    MockBatteryStatusChangedForTesting(status);
 }
 
 void EnableRendererLayoutTestMode() {