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

Unified Diff: content/public/test/test_renderer_host.h

Issue 2496233003: Destroy the old RenderWidgetHostView when swapping out a main frame. (Closed)
Patch Set: rebase Created 4 years, 1 month 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/public/test/test_renderer_host.h
diff --git a/content/public/test/test_renderer_host.h b/content/public/test/test_renderer_host.h
index afd42d1758b259580651140b016bf8bca7736f86..2ce69d4b47235daa6c78145557ee668f55df64bd 100644
--- a/content/public/test/test_renderer_host.h
+++ b/content/public/test/test_renderer_host.h
@@ -175,6 +175,9 @@ class RenderViewHostTestEnabler {
DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestEnabler);
friend class RenderViewHostTestHarness;
+#if defined(OS_ANDROID)
+ std::unique_ptr<MockGpuChannelEstablishFactory> gpu_channel_factory_;
Charlie Reis 2016/11/23 07:25:22 Similarly, what made this change necessary?
lfg 2016/11/29 17:41:22 Same as the other change, this is necessary to all
+#endif
std::unique_ptr<MockRenderProcessHostFactory> rph_factory_;
std::unique_ptr<TestRenderViewHostFactory> rvh_factory_;
std::unique_ptr<TestRenderFrameHostFactory> rfh_factory_;
@@ -276,9 +279,6 @@ class RenderViewHostTestHarness : public testing::Test {
#if defined(USE_AURA)
std::unique_ptr<aura::test::AuraTestHelper> aura_test_helper_;
#endif
-#if defined(OS_ANDROID)
- std::unique_ptr<MockGpuChannelEstablishFactory> gpu_channel_factory_;
-#endif
RenderViewHostTestEnabler rvh_test_enabler_;
DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);

Powered by Google App Engine
This is Rietveld 408576698