| Index: content/browser/renderer_host/test_render_view_host.h
|
| diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h
|
| index 2803e538cf2e1f271d580512bb421be0c3da55d7..aedd94958771cfc329a9e4eb0dabedf3567cee3f 100644
|
| --- a/content/browser/renderer_host/test_render_view_host.h
|
| +++ b/content/browser/renderer_host/test_render_view_host.h
|
| @@ -73,8 +73,6 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
|
| virtual gfx::NativeView BuildInputMethodsGtkMenu() OVERRIDE;
|
| #endif // !defined(TOOLKIT_VIEWS)
|
| #endif // defined(TOOLKIT_USES_GTK)
|
| - virtual void UnhandledWheelEvent(
|
| - const WebKit::WebMouseWheelEvent& event) OVERRIDE {}
|
| virtual bool CopyFromCompositingSurface(
|
| const gfx::Size& size,
|
| skia::PlatformCanvas* output) OVERRIDE;
|
| @@ -232,7 +230,6 @@ class TestRenderViewHost
|
| virtual void SimulateSwapOutACK() OVERRIDE;
|
| virtual void SimulateWasHidden() OVERRIDE;
|
| virtual void SimulateWasRestored() OVERRIDE;
|
| - virtual bool TestOnMessageReceived(const IPC::Message& msg) OVERRIDE;
|
|
|
| void TestOnMsgStartDragging(const WebDropData& drop_data);
|
|
|
| @@ -301,7 +298,8 @@ class TestRenderViewHost
|
| #endif
|
|
|
| // Adds methods to get straight at the impl classes.
|
| -class RenderViewHostImplTestHarness : public RenderViewHostTestHarness {
|
| +class RenderViewHostImplTestHarness
|
| + : public content::RenderViewHostTestHarness {
|
| public:
|
| RenderViewHostImplTestHarness();
|
| virtual ~RenderViewHostImplTestHarness();
|
|
|