Changes code using Compositor to pass in ContextFactory

ash/test/ash_test_helper.cc

Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index 3dd945530e5f737dbf9a02950a86be8a624e1808..f0a3e875f8c3cc57b34645dc9b8e5a938669c07b 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -43,7 +43,8 @@ namespace ash {
 namespace test {
 
 AshTestHelper::AshTestHelper(base::MessageLoopForUI* message_loop)
-    : message_loop_(message_loop),
+    : context_factory_(NULL),
+      message_loop_(message_loop),
       test_shell_delegate_(NULL),
       test_screenshot_delegate_(NULL),
       dbus_thread_manager_initialized_(false) {
@@ -65,7 +66,7 @@ void AshTestHelper::SetUp(bool start_session) {
   ui::InitializeInputMethodForTesting();
 
   bool enable_pixel_output = false;
-  ui::InitializeContextFactoryForTests(enable_pixel_output);
+  context_factory_ = ui::InitializeContextFactoryForTests(enable_pixel_output);
 
   // Creates Shell and hook with Desktop.
   if (!test_shell_delegate_)
@@ -87,6 +88,7 @@ void AshTestHelper::SetUp(bool start_session) {
 #endif
   ShellInitParams init_params;
   init_params.delegate = test_shell_delegate_;
+  init_params.context_factory = context_factory_;
   ash::Shell::CreateInstance(init_params);
   aura::test::EnvTestHelper(aura::Env::GetInstance()).SetInputStateLookup(
       scoped_ptr<aura::InputStateLookup>());