Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2267)

Unified Diff: ash/test/ash_test_helper.cc

Issue 15025002: Remove ENABLE_MESSAGE_CENTER (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: one moer fix Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index c95fe28e6b48c0c1b4187fc69c74bb0c1c25eaf6..a2fb390fc3ded9f3dc181fd1f54424a9a59554bf 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -14,11 +14,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
namespace ash {
namespace test {
@@ -45,11 +41,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
ash::Shell::CreateInstance(test_shell_delegate_);
Shell* shell = Shell::GetInstance();
test::DisplayManagerTestApi(shell->display_manager()).
@@ -62,10 +56,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
aura::Env::DeleteInstance();
ui::TextInputTestSupport::Shutdown();

Powered by Google App Engine
This is Rietveld 408576698