Revert "Revert of content: Fix Context creation logic in ContextProviderFactoryImpl. (patchset #10 …

content/public/test/test_renderer_host.h

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 3a645cf51c92f2da3aae875fd2ba889c050eb873..af258d3cc29a89a6db7a2ef014e4d4dacd3d1685 100644
--- a/content/public/test/test_renderer_host.h
+++ b/content/public/test/test_renderer_host.h
@@ -36,6 +36,7 @@ namespace content {
 
 class BrowserContext;
 class ContentBrowserSanityChecker;
+class MockGpuChannelEstablishFactory;
 class MockRenderProcessHost;
 class MockRenderProcessHostFactory;
 class NavigationController;
@@ -281,6 +282,9 @@ 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);