The 1st patch to disambiguate message center notifications

chrome/browser/notifications/extension_welcome_notification.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 "base/guid.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 271 matching lines @@
     if (pop_up_request == POP_UP_HIDDEN)
       message_center_notification->set_shown_as_popup(true);
 
     GetMessageCenter()->AddNotification(message_center_notification.Pass());
     StartExpirationTimer();
   }
 }
 
 void ExtensionWelcomeNotification::HideWelcomeNotification() {
   if (!welcome_notification_id_.empty() &&
-      GetMessageCenter()->HasNotification(welcome_notification_id_)) {
+      GetMessageCenter()->FindVisibleNotificationById(
+          welcome_notification_id_) != NULL) {
     GetMessageCenter()->RemoveNotification(welcome_notification_id_, false);
     StopExpirationTimer();
   }
 }
 
 bool ExtensionWelcomeNotification::UserHasDismissedWelcomeNotification() const {
   // This was previously a syncable preference; now it's per-machine.
   // Only the local pref will be written moving forward, but check for both so
   // users won't be double-toasted.
   bool shown_synced = profile_->GetPrefs()->GetBoolean(
@@ skipping 56 matching lines @@
       prefs::kWelcomeNotificationExpirationTimestamp,
       (delegate_->GetCurrentTime() +
           base::TimeDelta::FromDays(kRequestedShowTimeDays)).ToInternalValue());
 }
 
 bool ExtensionWelcomeNotification::IsWelcomeNotificationExpired() const {
   const base::Time expiration_timestamp = GetExpirationTimestamp();
   return !expiration_timestamp.is_null() &&
          (expiration_timestamp <= delegate_->GetCurrentTime());
 }