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

content/test/layouttest_support.cc

 // Copyright (c) 2012 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.
 
 #include "content/public/test/layouttest_support.h"
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #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"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
 #include "content/shell/renderer/test_runner/test_common.h"
 #include "content/shell/renderer/test_runner/web_frame_test_proxy.h"
 #include "content/shell/renderer/test_runner/web_test_proxy.h"
@@ skipping 54 matching lines @@
 
 void EnableWebTestProxyCreation(
     const base::Callback<void(RenderView*, WebTestProxyBase*)>& callback) {
   g_callback.Get() = callback;
   RenderViewImpl::InstallCreateHook(CreateWebTestProxy);
   RenderFrameImpl::InstallCreateHook(CreateWebFrameTestProxy);
 }
 
 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) {
   RendererWebKitPlatformSupportImpl::SetMockDeviceLightDataForTesting(data);
 }
 
 void SetMockDeviceMotionData(const WebDeviceMotionData& data) {
   RendererWebKitPlatformSupportImpl::SetMockDeviceMotionDataForTesting(data);
 }
 
 void SetMockDeviceOrientationData(const WebDeviceOrientationData& data) {
   RendererWebKitPlatformSupportImpl::
       SetMockDeviceOrientationDataForTesting(data);
 }
 
 void MockBatteryStatusChanged(const WebBatteryStatus& status) {
-  RenderThreadImpl::current()->webkit_platform_support()->
-    MockBatteryStatusChangedForTesting(status);
+  RendererWebKitPlatformSupportImpl::MockBatteryStatusChangedForTesting(status);
 }
 
 void EnableRendererLayoutTestMode() {
   RenderThreadImpl::current()->set_layout_test_mode(true);
 }
 
 void EnableBrowserLayoutTestMode() {
 #if defined(OS_MACOSX)
   ImageTransportSurface::SetAllowOSMesaForTesting(true);
   PopupMenuHelper::DontShowPopupMenuForTesting();
@@ skipping 236 matching lines @@
   }
   result.append("===============================================\n");
   return result;
 }
 
 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) {
   return new WebLayerImpl(layer);
 }
 
 }  // namespace content