Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(614)

Unified Diff: content/browser/renderer_host/test_render_view_host.h

Issue 9473001: Extract minimal RenderViewHost interface for embedders, leaving (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to LKGR, fix a weird runtime issue. Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 dec9719b7f5cd308b4443627e2e0bcf88132744a..cc960c32925805e8ed327052992a2052f2840227 100644
--- a/content/browser/renderer_host/test_render_view_host.h
+++ b/content/browser/renderer_host/test_render_view_host.h
@@ -187,12 +187,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(
@@ -271,6 +277,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);
@@ -290,6 +300,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

Powered by Google App Engine
This is Rietveld 408576698