The 1st patch to disambiguate message center notifications

ash/system/chromeos/screen_security/screen_tray_item_unittest.cc

 // Copyright 2013 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/chromeos/screen_security/screen_tray_item.h"
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/screen_security/screen_capture_tray_item.h"
 #include "ash/system/chromeos/screen_security/screen_share_tray_item.h"
 #include "ash/system/tray/tray_item_view.h"
@@ skipping 163 matching lines @@
 
   TestNotificationStartAndStop(this, start_func, stop_func);
 }
 
 void TestNotificationView(ScreenTrayItemTest* test) {
   ScreenTrayItem* tray_item = test->tray_item();
 
   test->StartSession();
   message_center::MessageCenter* message_center =
       message_center::MessageCenter::Get();
-  EXPECT_TRUE(message_center->HasNotification(tray_item->GetNotificationId()));
+  EXPECT_TRUE(message_center->FindVisibleNotificationById(
+      tray_item->GetNotificationId()));
   test->StopSession();
 }
 
 TEST_F(ScreenCaptureTest, NotificationView) { TestNotificationView(this); }
 TEST_F(ScreenShareTest, NotificationView) { TestNotificationView(this); }
 
 void TestSystemTrayInteraction(ScreenTrayItemTest* test) {
   ScreenTrayItem* tray_item = test->tray_item();
   EXPECT_FALSE(tray_item->tray_view()->visible());
 
@@ skipping 21 matching lines @@
 
 TEST_F(ScreenCaptureTest, SystemTrayInteraction) {
   TestSystemTrayInteraction(this);
 }
 
 TEST_F(ScreenShareTest, SystemTrayInteraction) {
   TestSystemTrayInteraction(this);
 }
 
 }  // namespace ash