Changes code using Compositor to pass in ContextFactory

ash/test/ash_test_helper.cc

 // Copyright 2013 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 "ash/test/ash_test_helper.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
@@ skipping 25 matching lines @@
 #endif
 
 #if defined(USE_X11)
 #include "ui/aura/window_tree_host_x11.h"
 #endif
 
 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) {
   CHECK(message_loop_);
 #if defined(USE_X11)
   aura::test::SetUseOverrideRedirectWindowByDefault(true);
 #endif
 }
 
 AshTestHelper::~AshTestHelper() {
 }
 
 void AshTestHelper::SetUp(bool start_session) {
   views_delegate_.reset(new AshTestViewsDelegate);
 
   // Disable animations during tests.
   zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
   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_)
     test_shell_delegate_ = new TestShellDelegate;
 
   // Creates MessageCenter since g_browser_process is not created in AshTestBase
   // tests.
   message_center::MessageCenter::Initialize();
 
 #if defined(OS_CHROMEOS)
   // Create DBusThreadManager for testing.
   if (!chromeos::DBusThreadManager::IsInitialized()) {
     chromeos::DBusThreadManager::InitializeWithStub();
     dbus_thread_manager_initialized_ = true;
   }
   // Create CrasAudioHandler for testing since g_browser_process is not
   // created in AshTestBase tests.
   chromeos::CrasAudioHandler::InitializeForTesting();
 #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>());
 
   Shell* shell = Shell::GetInstance();
   if (start_session) {
     test_shell_delegate_->test_session_state_delegate()->
         SetActiveUserSessionStarted(true);
     test_shell_delegate_->test_session_state_delegate()->
         SetHasActiveUser(true);
@@ skipping 67 matching lines @@
 bool AshTestHelper::SupportsHostWindowResize() {
 #if defined(OS_WIN)
   return false;
 #else
   return true;
 #endif
 }
 
 }  // namespace test
 }  // namespace ash