The 1st patch to disambiguate message center notifications

chrome/browser/chromeos/net/network_portal_notification_controller_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 "base/command_line.h"
 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/network/network_state.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_observer.h"
 
 using message_center::MessageCenter;
 
 namespace chromeos {
 
 namespace {
 
 const char* kNotificationId =
     NetworkPortalNotificationController::kNotificationId;
 
 bool HasNotification() {
-  return MessageCenter::Get()->HasNotification(kNotificationId);
+  MessageCenter* message_center = MessageCenter::Get();
+  return message_center->FindVisibleNotificationById(kNotificationId);
 }
 
 class NotificationObserver : public message_center::MessageCenterObserver {
  public:
   NotificationObserver() : add_count_(0), remove_count_(0), update_count_(0) {}
 
   // Overridden from message_center::MessageCenterObserver:
   virtual void OnNotificationAdded(
       const std::string& notification_id) OVERRIDE {
     if (notification_id == kNotificationId)
@@ skipping 156 matching lines @@
   // Network was switched (by shill or by user) to wifi1. Notification
   // should be displayed.
   OnPortalDetectionCompleted(&wifi1, portal_state);
   ASSERT_TRUE(HasNotification());
   EXPECT_EQ(2u, observer().add_count());
   EXPECT_EQ(1u, observer().remove_count());
   EXPECT_EQ(1u, observer().update_count());
 }
 
 }  // namespace chromeos