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

ui/message_center/notification_list_unittest.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 "ui/message_center/notification_list.h"
 
 #include "base/basictypes.h"
 #include "base/i18n/time_formatting.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 510 matching lines @@
                                       gfx::Image(),
                                       UTF8ToUTF16(kDisplaySource),
                                       NotifierId(NotifierId::APPLICATION,
                                                  kExtensionId),
                                       priority,
                                       NULL));
   notification_list()->UpdateNotificationMessage(id1, notification.Pass());
   EXPECT_EQ(0u, GetPopupCounts());
 }
 
-TEST_F(NotificationListTest, WebNotificationUpdatePromotion) {
-  std::string notification_id = "replaced-web-notification";
-  scoped_ptr<Notification> original_notification(
-      new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                       notification_id,
-                       UTF8ToUTF16("Web Notification"),
-                       UTF8ToUTF16("Notification contents"),
-                       gfx::Image(),
-                       UTF8ToUTF16(kDisplaySource),
-                       NotifierId(GURL("https://example.com/")),
-                       message_center::RichNotificationData(),
-                       NULL));
-
-  EXPECT_EQ(0u, GetPopupCounts());
-  notification_list()->AddNotification(original_notification.Pass());
-  EXPECT_EQ(1u, GetPopupCounts());
-
-  notification_list()->MarkSinglePopupAsShown(notification_id, true);
-  EXPECT_EQ(0u, GetPopupCounts());
-
-  scoped_ptr<Notification> replaced_notification(
-      new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                       notification_id,
-                       UTF8ToUTF16("Web Notification Replacement"),
-                       UTF8ToUTF16("New notification contents"),
-                       gfx::Image(),
-                       UTF8ToUTF16(kDisplaySource),
-                       NotifierId(GURL("https://example.com/")),
-                       message_center::RichNotificationData(),
-                       NULL));
-
-  // Web Notifications will be re-shown as popups even if their priority didn't
-  // change, to match the behavior of the Web Notification API.
-  notification_list()->UpdateNotificationMessage(notification_id,
-                                                 replaced_notification.Pass());
-  EXPECT_EQ(1u, GetPopupCounts());
-}
-
 TEST_F(NotificationListTest, NotificationOrderAndPriority) {
   base::Time now = base::Time::Now();
   message_center::RichNotificationData optional;
   optional.timestamp = now;
   optional.priority = 2;
   std::string max_id = AddNotification(optional);
 
   now += base::TimeDelta::FromSeconds(1);
   optional.timestamp = now;
   optional.priority = 1;
@@ skipping 172 matching lines @@
       NULL));
   notification_list()->AddNotification(updated_notification.Pass());
 
   EXPECT_FALSE(notification_list()->HasNotificationOfType(
       id, message_center::NOTIFICATION_TYPE_SIMPLE));
   EXPECT_TRUE(notification_list()->HasNotificationOfType(
       id, message_center::NOTIFICATION_TYPE_PROGRESS));
 }
 
 }  // namespace message_center