Revert of Web Notifications should always reappear as popups when updated.

chrome/browser/notifications/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 <deque>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 104 matching lines @@
 };
 
 }  // namespace
 
 class NotificationsTest : public InProcessBrowserTest {
  public:
   NotificationsTest() {}
 
  protected:
   int GetNotificationCount();
-  int GetNotificationPopupCount();
 
   void CloseBrowserWindow(Browser* browser);
   void CrashTab(Browser* browser, int index);
 
   void DenyOrigin(const GURL& origin);
   void AllowOrigin(const GURL& origin);
   void AllowAllOrigins();
   void SetDefaultContentSetting(ContentSetting setting);
 
   void VerifyInfoBar(const Browser* browser, int index);
@@ skipping 22 matching lines @@
   }
 
  private:
   void DropOriginPreference(const GURL& origin);
 };
 
 int NotificationsTest::GetNotificationCount() {
   return message_center::MessageCenter::Get()->NotificationCount();
 }
 
-int NotificationsTest::GetNotificationPopupCount() {
-  return message_center::MessageCenter::Get()->GetPopupNotifications().size();
-}
-
 void NotificationsTest::CloseBrowserWindow(Browser* browser) {
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::Source<Browser>(browser));
   browser->window()->Close();
   observer.Wait();
 }
 
 void NotificationsTest::CrashTab(Browser* browser, int index) {
   content::CrashTab(browser->tab_strip_model()->GetWebContentsAt(index));
@@ skipping 559 matching lines @@
       NEW_BACKGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
   browser()->tab_strip_model()->ActivateTabAt(0, true);
   ui_test_utils::NavigateToURL(browser(), GetTestPageURL());
   CreateSimpleNotification(browser(), true);
   ASSERT_EQ(1, GetNotificationCount());
   CrashTab(browser(), 0);
   ASSERT_EQ(1, GetNotificationCount());
 }
 
-IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNotificationReplacement) {
+// See http://crbug.com/366539
+#if defined(OS_LINUX)
+#define MAYBE_TestNotificationReplacement DISABLED_TestNotificationReplacement
+#else
+#define MAYBE_TestNotificationReplacement TestNotificationReplacement
+#endif
+
+IN_PROC_BROWSER_TEST_F(NotificationsTest, MAYBE_TestNotificationReplacement) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
-  // Test that we can replace a notification using the tag.
+  // Test that we can replace a notification using the replaceId.
   AllowAllOrigins();
 
   ui_test_utils::NavigateToURL(browser(), GetTestPageURL());
 
   std::string result = CreateNotification(
       browser(), true, "abc.png", "Title1", "Body1", "chat");
   EXPECT_NE("-1", result);
 
   ASSERT_EQ(1, GetNotificationCount());
 
@@ skipping 35 matching lines @@
 
   result = CreateSimpleNotification(browser(), true);
   EXPECT_NE("-1", result);
 
   EXPECT_EQ(settings_map->GetLastUsage(GetTestPageURL().GetOrigin(),
                                        GetTestPageURL().GetOrigin(),
                                        CONTENT_SETTINGS_TYPE_NOTIFICATIONS)
                 .ToDoubleT(),
             13);
 }
-
-IN_PROC_BROWSER_TEST_F(NotificationsTest,
-                       TestNotificationReplacementReappearance) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-
-  // Test that we can replace a notification using the tag, and that it will
-  // cause the notification to reappear as a popup again.
-  AllowAllOrigins();
-
-  ui_test_utils::NavigateToURL(browser(), GetTestPageURL());
-
-  ASSERT_EQ(0, GetNotificationPopupCount());
-
-  std::string result = CreateNotification(
-      browser(), true, "abc.png", "Title1", "Body1", "chat");
-  EXPECT_NE("-1", result);
-
-  ASSERT_EQ(1, GetNotificationPopupCount());
-
-  message_center::NotificationList::Notifications notifications =
-      message_center::MessageCenter::Get()->GetVisibleNotifications();
-  message_center::MessageCenter::Get()->ClickOnNotification(
-      (*notifications.rbegin())->id());
-
-  ASSERT_EQ(0, GetNotificationPopupCount());
-
-  result = CreateNotification(
-      browser(), true, "abc.png", "Title2", "Body2", "chat");
-  EXPECT_NE("-1", result);
-
-  ASSERT_EQ(1, GetNotificationPopupCount());
-}