| Index: ash/test/ash_test_helper.cc
|
| diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
|
| index 6392f3a6e5e67f54e889df789ec69bb33d8cc6b0..50d3879d1f2cf9a69a04a2d4092f8be972159965 100644
|
| --- a/ash/test/ash_test_helper.cc
|
| +++ b/ash/test/ash_test_helper.cc
|
| @@ -13,10 +13,7 @@
|
| #include "ui/aura/env.h"
|
| #include "ui/base/ime/text_input_test_support.h"
|
| #include "ui/compositor/scoped_animation_duration_scale_mode.h"
|
| -
|
| -#if defined(ENABLE_MESSAGE_CENTER)
|
| #include "ui/message_center/message_center.h"
|
| -#endif
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "chromeos/audio/cras_audio_handler.h"
|
| @@ -43,11 +40,9 @@ void AshTestHelper::SetUp() {
|
| // Creates Shell and hook with Desktop.
|
| test_shell_delegate_ = new TestShellDelegate;
|
|
|
| -#if defined(ENABLE_MESSAGE_CENTER)
|
| // Creates MessageCenter since g_browser_process is not created in AshTestBase
|
| // tests.
|
| message_center::MessageCenter::Initialize();
|
| -#endif
|
|
|
| #if defined(OS_CHROMEOS)
|
| if (ash::switches::UseNewAudioHandler()) {
|
| @@ -69,10 +64,8 @@ void AshTestHelper::TearDown() {
|
| // Tear down the shell.
|
| Shell::DeleteInstance();
|
|
|
| -#if defined(ENABLE_MESSAGE_CENTER)
|
| // Remove global message center state.
|
| message_center::MessageCenter::Shutdown();
|
| -#endif
|
|
|
| #if defined(OS_CHROMEOS)
|
| if (ash::switches::UseNewAudioHandler())
|
|
|