ui + mus: Split ContextFactory into ContextFactory(Client) and ContextFactoryPrivate

content/public/test/test_renderer_host.cc

Index: content/public/test/test_renderer_host.cc
diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc
index 6817a5a0ac6e40a6008973d12b39e46571055ffb..38f524ec93cc01a76fc0feca7a0a23b5992c9f3f 100644
--- a/content/public/test/test_renderer_host.cc
+++ b/content/public/test/test_renderer_host.cc
@@ -252,10 +252,12 @@ void RenderViewHostTestHarness::SetUp() {
 #if defined(USE_AURA)
   ui::ContextFactory* context_factory =
       ImageTransportFactory::GetInstance()->GetContextFactory();
+  ui::ContextFactoryPrivate* context_factory_private =
+      ImageTransportFactory::GetInstance()->GetContextFactoryPrivate();
 
   aura_test_helper_.reset(
       new aura::test::AuraTestHelper(base::MessageLoopForUI::current()));
-  aura_test_helper_->SetUp(context_factory);
+  aura_test_helper_->SetUp(context_factory, context_factory_private);
   new wm::DefaultActivationClient(aura_test_helper_->root_window());
 #endif