| 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 045d1bed7cc2bd2d62ecd11562570ec16cd72366..6727807070a84e4a5a01613ecde760a968e62042 100644
|
| --- a/content/browser/renderer_host/test_render_view_host.h
|
| +++ b/content/browser/renderer_host/test_render_view_host.h
|
| @@ -13,7 +13,7 @@
|
| #include "content/browser/renderer_host/mock_render_process_host.h"
|
| #include "content/browser/renderer_host/render_view_host.h"
|
| #include "content/browser/renderer_host/render_view_host_factory.h"
|
| -#include "content/browser/renderer_host/render_widget_host_view.h"
|
| +#include "content/browser/renderer_host/render_widget_host_view_base.h"
|
| #include "content/public/common/page_transition_types.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -50,6 +50,9 @@ void SimulateUpdateRect(RenderWidgetHost* widget,
|
| //
|
| // To use, derive your test base class from RenderViewHostTestHarness.
|
|
|
| +
|
| +namespace content {
|
| +
|
| // TestRenderViewHostView ------------------------------------------------------
|
|
|
| // Subclass the RenderViewHost's view so that we can call Show(), etc.,
|
| @@ -87,7 +90,7 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
|
| virtual void UnhandledWheelEvent(
|
| const WebKit::WebMouseWheelEvent& event) OVERRIDE {}
|
|
|
| - // RenderWidgetHostViewBase implementation.
|
| + // RenderWidgetHostViewPort implementation.
|
| virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
|
| const gfx::Rect& pos) OVERRIDE {}
|
| virtual void InitAsFullscreen(
|
| @@ -177,6 +180,8 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
|
| bool is_showing_;
|
| };
|
|
|
| +} // namespace content
|
| +
|
| // TestRenderViewHost ----------------------------------------------------------
|
|
|
| // TODO(brettw) this should use a TestTabContents which should be generalized
|
|
|