aura: Clean up compositor initialization/destruction.

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/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/run_loop.h"
 #include "ui/aura/env.h"
 #include "ui/base/ime/input_method_initializer.h"
+#include "ui/compositor/compositor.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/message_center/message_center.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/audio/cras_audio_handler.h"
 #endif
 
 #if defined(USE_X11)
 #include "ui/aura/root_window_host_x11.h"
 #endif
@@ skipping 27 matching lines @@
   message_center::MessageCenter::Initialize();
 
 #if defined(OS_CHROMEOS)
   if (ash::switches::UseNewAudioHandler()) {
     // Create CrasAuidoHandler for testing since g_browser_process is not
     // created in AshTestBase tests.
     chromeos::CrasAudioHandler::InitializeForTesting();
   }
 #endif
 
+  // The ContextFactory must exist before any Compositors are created.
+  bool allow_test_contexts = true;
+  ui::Compositor::InitializeContextFactoryForTests(allow_test_contexts);
+
   ash::Shell::CreateInstance(test_shell_delegate_);
   Shell* shell = Shell::GetInstance();
   test_shell_delegate_->test_session_state_delegate()->
       SetActiveUserSessionStarted(true);
   test_shell_delegate_->test_session_state_delegate()->SetHasActiveUser(true);
 
   test::DisplayManagerTestApi(shell->display_manager()).
       DisableChangeDisplayUponHostResize();
   ShellTestApi(shell).DisableOutputConfiguratorAnimation();
 }
@@ skipping 27 matching lines @@
 aura::RootWindow* AshTestHelper::CurrentContext() {
   aura::RootWindow* root_window = Shell::GetActiveRootWindow();
   if (!root_window)
     root_window = Shell::GetPrimaryRootWindow();
   DCHECK(root_window);
   return root_window;
 }
 
 }  // namespace test
 }  // namespace ash