Re-home the global MessageCenter to support Ash+Win environments.

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.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_controls.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/ime/text_input_test_support.h"
 #include "ui/compositor/test/compositor_test_support.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #include "ui/views/widget/widget.h"
 
+#if defined(ENABLE_MESSAGE_CENTER)
+#include "ui/message_center/message_center.h"
+#endif
+
 #if defined(USE_ASH)
 #include "ash/shell.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"
@@ skipping 60 matching lines @@
   ui::TextInputTestSupport::Initialize();
   ui::CompositorTestSupport::Initialize();
   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
+#if defined(ENABLE_MESSAGE_CENTER)
+  // 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();
+#endif
   ash::Shell::CreateInstance(new ash::test::TestShellDelegate());
   context = ash::Shell::GetPrimaryRootWindow();
 #endif
 #elif defined(USE_AURA)
   // Instead of using the ash shell, use an AuraTestHelper to create and manage
   // the test screen.
   aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
   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(ENABLE_MESSAGE_CENTER)
+  // 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();
+#endif
   aura::Env::DeleteInstance();
 #endif
 #elif defined(USE_AURA)
   aura_test_helper_->TearDown();
 #endif
   ui::CompositorTestSupport::Terminate();
   ui::TextInputTestSupport::Shutdown();
 }
 
 bool ViewEventTestBase::CanResize() const {
@@ skipping 58 matching lines @@
   dnd_thread_.reset(NULL);
 }
 
 void ViewEventTestBase::RunTestMethod(const base::Closure& task) {
   StopBackgroundThread();
 
   task.Run();
   if (HasFatalFailure())
     Done();
 }