| 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 a4b27d112bf1deb2094da25a1f7e29fd382ecefc..c659ed882a8e0dcd9ecf16f054495e76d1322e7c 100644
|
| --- a/content/browser/renderer_host/test_render_view_host.h
|
| +++ b/content/browser/renderer_host/test_render_view_host.h
|
| @@ -184,12 +184,18 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
|
|
|
| } // namespace content
|
|
|
| +#if defined(OS_WIN)
|
| +// See comment for same warning on RenderViewHostImpl.
|
| +#pragma warning(push)
|
| +#pragma warning(disable: 4250)
|
| +#endif
|
| +
|
| // TestRenderViewHost ----------------------------------------------------------
|
|
|
| // TODO(brettw) this should use a TestTabContents which should be generalized
|
| // from the TabContents test. We will probably also need that class' version of
|
| // CreateRenderViewForRenderManager when more complicate tests start using this.
|
| -class TestRenderViewHost : public RenderViewHost {
|
| +class TestRenderViewHost : public RenderViewHostImpl {
|
| public:
|
| // If the given TabContnets has a pending RVH, returns it, otherwise NULL.
|
| static TestRenderViewHost* GetPendingForController(
|
| @@ -268,6 +274,10 @@ class TestRenderViewHost : public RenderViewHost {
|
| int32 max_page_id) OVERRIDE;
|
| virtual bool IsRenderViewLive() const OVERRIDE;
|
|
|
| + // This removes the need to expose
|
| + // RenderViewHostImpl::is_swapped_out() outside of content.
|
| + static bool IsRenderViewHostSwappedOut(RenderViewHost* rwh);
|
| +
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate);
|
|
|
| @@ -287,6 +297,10 @@ class TestRenderViewHost : public RenderViewHost {
|
| DISALLOW_COPY_AND_ASSIGN(TestRenderViewHost);
|
| };
|
|
|
| +#if defined(OS_WIN)
|
| +#pragma warning(pop)
|
| +#endif
|
| +
|
| // TestRenderViewHostFactory ---------------------------------------------------
|
|
|
| // Manages creation of the RenderViewHosts using our special subclass. This
|
|
|