Revert 199625 "Remove ENABLE_MESSAGE_CENTER"

trunk/src/chrome/browser/task_manager/task_manager_notification_browsertest.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/browser/task_manager/task_manager.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/common/content_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/message_center/message_center_util.h"
+
+#if !defined(ENABLE_MESSAGE_CENTER)
+// These tests do not apply with Message Center platforms
+// where notifications do not instantiate a new renderer.
 
 class TaskManagerNotificationBrowserTest : public ExtensionBrowserTest {
  public:
   TaskManagerModel* model() const {
     return TaskManager::GetInstance()->model();
   }
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
 
     // Do not prelaunch the GPU process for these tests because it will show
     // up in task manager but whether it appears before or after the new tab
     // renderer process is not well defined.
     command_line->AppendSwitch(switches::kDisableGpuProcessPrelaunch);
   }
 };
 
 // TODO(linux_aura) http://crbug.com/163931
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
 #define MAYBE_NoticeNotificationChanges DISABLED_NoticeNotificationChanges
 #else
 #define MAYBE_NoticeNotificationChanges NoticeNotificationChanges
 #endif
 IN_PROC_BROWSER_TEST_F(TaskManagerNotificationBrowserTest,
                        MAYBE_NoticeNotificationChanges) {
-  // These tests do not apply with Message Center platforms
-  // where notifications do not instantiate a new renderer.
-  if (message_center::IsRichNotificationEnabled())
-    return;
-
   EXPECT_EQ(0, model()->ResourceCount());
 
   // Show the task manager.
   chrome::ShowTaskManager(browser(), false);
   // Expect to see the browser and the New Tab Page renderer.
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
 
   // Show a notification.
   NotificationUIManager* notifications =
       g_browser_process->notification_ui_manager();
@@ skipping 11 matching lines @@
 
   notifications->Add(n1, browser()->profile());
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);
   notifications->Add(n2, browser()->profile());
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(3);
   notifications->CancelById(n1.notification_id());
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);
   notifications->CancelById(n2.notification_id());
   TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
 }
+
+#endif  // !ENABLE_MESSAGE_CENTER