Automatically close the default push notification when a real one appears.

chrome/browser/push_messaging/push_messaging_browsertest.cc

 // Copyright 2014 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 <map>
 #include <string>
 
 #include "base/barrier_closure.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 543 matching lines @@
   message.data["data"] = "testdata";
   SendMessageAndWaitUntilHandled(app_identifier, message);
   ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
   EXPECT_EQ("testdata", script_result);
   EXPECT_EQ(0u, notification_manager()->GetNotificationCount());
   message.data["data"] = "testdata";
   SendMessageAndWaitUntilHandled(app_identifier, message);
   ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
   EXPECT_EQ("testdata", script_result);
 
-  EXPECT_EQ(1u, notification_manager()->GetNotificationCount());
-  const Notification& forced_notification =
-      notification_manager()->GetNotificationAt(0);
+  ASSERT_EQ(1u, notification_manager()->GetNotificationCount());
+  {
+    const Notification& forced_notification =
+        notification_manager()->GetNotificationAt(0);
 
-  EXPECT_EQ(kPushMessagingForcedNotificationTag, forced_notification.tag());
-  EXPECT_TRUE(forced_notification.silent());
+    EXPECT_EQ(kPushMessagingForcedNotificationTag, forced_notification.tag());
+    EXPECT_TRUE(forced_notification.silent());
+  }
 
-  // Currently, this notification will stick around until the user or webapp
-  // explicitly dismisses it (though we may change this later).
+  // The notification will be automatically dismissed when the developer shows
+  // a new notification themselves at a later point in time.
   message.data["data"] = "shownotification";
   SendMessageAndWaitUntilHandled(app_identifier, message);
   ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
   EXPECT_EQ("shownotification", script_result);
-  EXPECT_EQ(2u, notification_manager()->GetNotificationCount());
+
+  ASSERT_EQ(1u, notification_manager()->GetNotificationCount());
+  {
+    const Notification& first_notification =
+        notification_manager()->GetNotificationAt(0);
+
+    EXPECT_NE(kPushMessagingForcedNotificationTag, first_notification.tag());
+  }
 
   notification_manager()->CancelAll();
   EXPECT_EQ(0u, notification_manager()->GetNotificationCount());
 
   // However if the Service Worker push event handler shows a notification, we
   // should not show a forced one.
   message.data["data"] = "shownotification";
   for (int n = 0; n < 9; n++) {
     SendMessageAndWaitUntilHandled(app_identifier, message);
     ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
@@ skipping 509 matching lines @@
   std::string script_result;
 
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
   ASSERT_EQ("ok - service worker registered", script_result);
 
   // In Incognito mode the promise returned by getSubscription should not hang,
   // it should just fulfill with null.
   ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
   ASSERT_EQ("false - not subscribed", script_result);
 }