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

content/public/test/test_renderer_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/test_renderer_host.h"
 
 #include <utility>
 
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 234 matching lines @@
   ContextProviderFactoryImpl::Initialize(gpu_channel_factory_.get());
   ui::ContextProviderFactory::SetInstance(
       ContextProviderFactoryImpl::GetInstance());
   if (!screen_)
     screen_.reset(ui::CreateDummyScreenAndroid());
   display::Screen::SetScreenInstance(screen_.get());
 #endif
 #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
 
   sanity_checker_.reset(new ContentBrowserSanityChecker());
 
   DCHECK(!browser_context_);
   browser_context_.reset(CreateBrowserContext());
 
   SetContents(CreateTestWebContents());
 
@@ skipping 54 matching lines @@
 BrowserContext* RenderViewHostTestHarness::CreateBrowserContext() {
   return new TestBrowserContext();
 }
 
 void RenderViewHostTestHarness::SetRenderProcessHostFactory(
     RenderProcessHostFactory* factory) {
   rvh_test_enabler_.rvh_factory_->set_render_process_host_factory(factory);
 }
 
 }  // namespace content