aura: Clean up compositor initialization/destruction.

chrome/test/base/view_event_test_base.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 "chrome/test/base/view_event_test_base.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/message_center/message_center.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
+#include "ash/test/ash_test_helper.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #endif
 
 #if defined(USE_AURA)
 #include "ui/aura/client/event_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_helper.h"
 #endif
@@ skipping 61 matching lines @@
 
 void ViewEventTestBase::SetUp() {
   ui::InitializeInputMethodForTesting();
   gfx::NativeView context = NULL;
 #if defined(USE_ASH)
 #if defined(OS_WIN)
   // http://crbug.com/154081 use ash::Shell code path below on win_ash bots when
   // interactive_ui_tests is brought up on that platform.
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
-#else
-  // Ash Shell can't just live on its own without a browser process, we need to
-  // also create the message center.
-  message_center::MessageCenter::Initialize();
-#if defined(OS_CHROMEOS)
-  chromeos::CrasAudioHandler::InitializeForTesting();
 #endif
-  ash::test::TestShellDelegate* shell_delegate =
-      new ash::test::TestShellDelegate();
-  ash::Shell::CreateInstance(shell_delegate);
-  shell_delegate->test_session_state_delegate()
-      ->SetActiveUserSessionStarted(true);
-  context = ash::Shell::GetPrimaryRootWindow();
-#endif
+  ash_test_helper_.reset(

[danakj, 2013/07/31 20:14:50]

Instead of doing all this ash setup here, use the AshTestHelper which does all
of these things already. It also sets up the compositor to use test contexts.

+      new ash::test::AshTestHelper(base::MessageLoopForUI::current()));
+  ash_test_helper_->SetUp();
+  context = ash_test_helper_->CurrentContext();
 #elif defined(USE_AURA)
-  // Instead of using the ash shell, use an AuraTestHelper to create and manage
-  // the test screen.
+  // Instead of using the AshTestHelper, use an AuraTestHelper to create and
+  // manage the test screen.
   aura_test_helper_.reset(
       new aura::test::AuraTestHelper(base::MessageLoopForUI::current()));
   aura_test_helper_->SetUp();
   context = aura_test_helper_->root_window();
 #endif
   window_ = views::Widget::CreateWindowWithContext(this, context);
 }
 
 void ViewEventTestBase::TearDown() {
   if (window_) {
 #if defined(OS_WIN) && !defined(USE_AURA)
     DestroyWindow(window_->GetNativeWindow());
 #else
     window_->Close();
     content::RunAllPendingInMessageLoop();
 #endif
     window_ = NULL;
   }
+
 #if defined(USE_ASH)
-#if defined(OS_WIN)
-#else
-  ash::Shell::DeleteInstance();
-#if defined(OS_CHROMEOS)
-  chromeos::CrasAudioHandler::Shutdown();
-#endif
-  // Ash Shell can't just live on its own without a browser process, we need to
-  // also shut down the message center.
-  message_center::MessageCenter::Shutdown();
-  aura::Env::DeleteInstance();
-#endif
+  ash_test_helper_->TearDown();
 #elif defined(USE_AURA)
   aura_test_helper_->TearDown();
 #endif
+
   ui::ShutdownInputMethodForTesting();
 }
 
 bool ViewEventTestBase::CanResize() const {
   return true;
 }
 
 views::View* ViewEventTestBase::GetContentsView() {
   if (!content_view_) {
     // Wrap the real view (as returned by CreateContentsView) in a View so
@@ skipping 51 matching lines @@
   dnd_thread_.reset(NULL);
 }
 
 void ViewEventTestBase::RunTestMethod(const base::Closure& task) {
   StopBackgroundThread();
 
   task.Run();
   if (HasFatalFailure())
     Done();
 }