Remove ENABLE_MESSAGE_CENTER

chrome/browser/extensions/notifications_apitest.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/extensions/extension_apitest.h"
 
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-
-#if defined(ENABLE_MESSAGE_CENTER)
-
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/lazy_background_page_test_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "ui/message_center/message_center_switches.h"
 #include "ui/message_center/message_center_util.h"
 
 class RichWebkitNotificationTest : public ExtensionApiTest {
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
@@ skipping 25 matching lines @@
       const std::string& test_name) {
     LazyBackgroundObserver page_complete;
     base::FilePath extdir = test_data_dir_.AppendASCII(test_name);
     const extensions::Extension* extension = LoadExtension(extdir);
     if (extension)
       page_complete.Wait();
     return extension;
   }
 };
 
-#endif
-
 // TODO(kbr): remove: http://crbug.com/222296
 #if defined(OS_MACOSX)
 #import "base/mac/mac_util.h"
 #endif
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NotificationsNoPermission) {
-#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
-  // Notifications not supported on linux/views yet.
-#else
+  if (!message_center::IsRichNotificationEnabled())
+    return;

[dewittj, 2013/05/08 18:53:01]

This is fine, but I wonder if this is a good place for a NOTIMPLEMENTED()?

[Dmitry Titov, 2013/05/08 23:03:26]

Done, added a special macro for that.

   ASSERT_TRUE(RunExtensionTest("notifications/has_not_permission")) << message_;
-#endif
 }
 
-#if defined(ENABLE_MESSAGE_CENTER)
 IN_PROC_BROWSER_TEST_F(RichWebkitNotificationTest, NoHTMLNotifications) {
+  if (!message_center::IsRichNotificationEnabled())
+    return;
   ASSERT_TRUE(RunExtensionTest("notifications/no_html")) << message_;
 }
 
 #if !defined(OS_CHROMEOS)
 // HTML notifications fail on ChromeOS whether or not rich notifications
 // are enabled.
 IN_PROC_BROWSER_TEST_F(DisabledRichWebkitNotificationTest,
                        HasHTMLNotifications) {
   ASSERT_FALSE(message_center::IsRichNotificationEnabled());
   ASSERT_TRUE(RunExtensionTest("notifications/has_permission_manifest"))
       << message_;
 }
 #endif
 
-#elif !defined(OS_LINUX) || !defined(TOOLKIT_VIEWS)
-// Notifications not supported on linux/views yet.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
                        NotificationsHasPermissionManifest) {
+  // Test is looking for HTML Notificaitons.

[dewittj, 2013/05/08 18:53:01]

nit: spelling

[Dmitry Titov, 2013/05/08 23:03:26]

Removed the whole test. It's giving exactly the coverage of the previous one,
running the same test under same condition (no rich notifications). Renamed the
previous one to make it clear.

+  if (message_center::IsRichNotificationEnabled())
+    return;
+
   ASSERT_TRUE(RunExtensionTest("notifications/has_permission_manifest"))
       << message_;
 }
-#endif
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NotificationsHasPermission) {
-#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
-  // Notifications not supported on linux/views yet.
-#else
-
 #if defined(OS_MACOSX)
   // TODO(kbr): re-enable: http://crbug.com/222296
   if (base::mac::IsOSMountainLionOrLater())
     return;
 #endif
 
   DesktopNotificationServiceFactory::GetForProfile(browser()->profile())
       ->GrantPermission(GURL(
           "chrome-extension://peoadpeiejnhkmpaakpnompolbglelel"));
   ASSERT_TRUE(RunExtensionTest("notifications/has_permission_prefs"))
       << message_;
-#endif
 }
 
-#if defined(ENABLE_MESSAGE_CENTER)
 IN_PROC_BROWSER_TEST_F(NotificationIdleTest, NotificationsAllowUnload) {
+  if (!message_center::IsRichNotificationEnabled())
+    return;
+
   const extensions::Extension* extension =
       LoadExtensionAndWait("notifications/api/unload");
   ASSERT_TRUE(extension) << message_;
 
   // Lazy Background Page has been shut down.
   ExtensionProcessManager* pm =
       extensions::ExtensionSystem::Get(profile())->process_manager();
   EXPECT_FALSE(pm->GetBackgroundHostForExtension(last_loaded_extension_id_));
 }
-#endif