Fix Ash notification updates

ash/system/web_notification/web_notification_tray_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 "ash/system/web_notification/web_notification_tray.h"
 
 #include <vector>
 
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_item.h"
@@ skipping 37 matching lines @@
 
   void AddNotification(WebNotificationTray* tray, const std::string& id) {
     notification_ids_.insert(id);
     tray->AddNotification(id,
                           ASCIIToUTF16("Test Web Notification"),
                           ASCIIToUTF16("Notification message body."),
                           ASCIIToUTF16("www.test.org"),
                           "" /* extension id */);
   }
 
+  void UpdateNotification(WebNotificationTray* tray,
+                          const std::string& old_id,
+                          const std::string& new_id) {
+    notification_ids_.erase(old_id);
+    notification_ids_.insert(new_id);
+    tray->UpdateNotification(old_id, new_id,
+                             ASCIIToUTF16("Updated Web Notification"),
+                             ASCIIToUTF16("Updated message body."));
+  }
+
   void RemoveNotification(WebNotificationTray* tray, const std::string& id) {
     tray->RemoveNotification(id);
+    notification_ids_.erase(id);
   }
 
   bool HasNotificationId(const std::string& id) {
     return notification_ids_.find(id) != notification_ids_.end();
   }
 
  private:
   std::set<std::string> notification_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDelegate);
 };
 
 }  // namespace
 
 typedef test::AshTestBase WebNotificationTrayTest;
 
 TEST_F(WebNotificationTrayTest, WebNotifications) {
   WebNotificationTray* tray = GetWebNotificationTray();
   scoped_ptr<TestDelegate> delegate(new TestDelegate);
   tray->SetDelegate(delegate.get());
 
   ASSERT_TRUE(tray->GetWidget());
 
+  // Add a notification.
+  delegate->AddNotification(tray, "test_id1");
+  EXPECT_EQ(1, tray->GetNotificationCount());
+  EXPECT_TRUE(tray->HasNotificationForTest("test_id1"));
+  delegate->AddNotification(tray, "test_id2");
+  delegate->AddNotification(tray, "test_id2");
+  EXPECT_EQ(2, tray->GetNotificationCount());
+  EXPECT_TRUE(tray->HasNotificationForTest("test_id2"));
+
+  // Ensure that updating a notification does not affect the count.
+  delegate->UpdateNotification(tray, "test_id2", "test_id3");
+  delegate->UpdateNotification(tray, "test_id3", "test_id3");
+  EXPECT_EQ(2, tray->GetNotificationCount());
+  EXPECT_FALSE(delegate->HasNotificationId("test_id2"));
+  EXPECT_FALSE(tray->HasNotificationForTest("test_id2"));
+  EXPECT_TRUE(delegate->HasNotificationId("test_id3"));
+
+  // Ensure that Removing the first notification removes it from the tray.
+  delegate->RemoveNotification(tray, "test_id1");
+  EXPECT_FALSE(delegate->HasNotificationId("test_id1"));
+  EXPECT_FALSE(tray->HasNotificationForTest("test_id1"));
+  EXPECT_EQ(1, tray->GetNotificationCount());
+
+  // Remove the remianing notification.
+  delegate->RemoveNotification(tray, "test_id3");
+  EXPECT_EQ(0, tray->GetNotificationCount());
+  EXPECT_FALSE(tray->HasNotificationForTest("test_id3"));
+}
+
+TEST_F(WebNotificationTrayTest, WebNotificationBubble) {
+  WebNotificationTray* tray = GetWebNotificationTray();
+  scoped_ptr<TestDelegate> delegate(new TestDelegate);
+  tray->SetDelegate(delegate.get());
+
+  ASSERT_TRUE(tray->GetWidget());
+
   // Adding a notification should show the bubble.
   delegate->AddNotification(tray, "test_id1");
   EXPECT_TRUE(tray->notification_bubble() != NULL);
-  EXPECT_EQ(1, tray->GetNotificationCount());
+
+  // Updating a notification should not hide the bubble.
   delegate->AddNotification(tray, "test_id2");
-  delegate->AddNotification(tray, "test_id2");
-  EXPECT_EQ(2, tray->GetNotificationCount());
-  // Ensure that removing a notification removes it from the tray, and signals
-  // the delegate.
-  EXPECT_TRUE(delegate->HasNotificationId("test_id2"));
-  delegate->RemoveNotification(tray, "test_id2");
-  EXPECT_FALSE(delegate->HasNotificationId("test_id2"));
-  EXPECT_EQ(1, tray->GetNotificationCount());
+  delegate->UpdateNotification(tray, "test_id2", "test_id3");
+  EXPECT_TRUE(tray->notification_bubble() != NULL);
 
-  // Removing the last notification should hide the bubble.
+  // Removing the first notification should not hide the bubble.
   delegate->RemoveNotification(tray, "test_id1");
-  EXPECT_EQ(0, tray->GetNotificationCount());
+  EXPECT_TRUE(tray->notification_bubble() != NULL);
+
+  // Removing the visible notification should hide the bubble.
+  delegate->RemoveNotification(tray, "test_id3");
   EXPECT_TRUE(tray->notification_bubble() == NULL);
 }
 
 }  // namespace ash