The 1st patch to disambiguate message center notifications

chrome/browser/notifications/extension_welcome_notification_unittest.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 "chrome/browser/notifications/extension_welcome_notification.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 22 matching lines @@
         notifications_with_shown_as_popup_(0) {
   }
 
   int add_notification_calls() { return add_notification_calls_; }
   int remove_notification_calls() { return remove_notification_calls_; }
   int notifications_with_shown_as_popup() {
     return notifications_with_shown_as_popup_;
   }
 
   // message_center::FakeMessageCenter Overrides
-  virtual bool HasNotification(const std::string& id) OVERRIDE {
-    return last_notification.get() && (last_notification->id() == id);
+  virtual message_center::Notification* FindVisibleNotificationById(
+      const std::string& id) OVERRIDE {
+    if (last_notification.get() && last_notification->id() == id)
+      return last_notification.get();
+    return NULL;
   }
 
   virtual void AddNotification(
       scoped_ptr<message_center::Notification> notification) OVERRIDE {
     EXPECT_FALSE(last_notification.get());
     last_notification.swap(notification);
     add_notification_calls_++;
     if (last_notification->shown_as_popup())
       notifications_with_shown_as_popup_++;
   }
@@ skipping 484 matching lines @@
 
   EXPECT_TRUE(task_runner()->GetPendingTasks().empty());
   EXPECT_EQ(message_center()->add_notification_calls(), 0);
   EXPECT_EQ(message_center()->remove_notification_calls(), 0);
   EXPECT_EQ(message_center()->notifications_with_shown_as_popup(), 0);
   EXPECT_FALSE(GetBooleanPref(prefs::kWelcomeNotificationDismissed));
   EXPECT_TRUE(GetBooleanPref(prefs::kWelcomeNotificationDismissedLocal));
   EXPECT_TRUE(GetBooleanPref(prefs::kWelcomeNotificationPreviouslyPoppedUp));
   EXPECT_EQ(GetInt64Pref(prefs::kWelcomeNotificationExpirationTimestamp), 1);
 }