| Index: ash/common/system/user/tray_user_unittest.cc
|
| diff --git a/ash/common/system/user/tray_user_unittest.cc b/ash/common/system/user/tray_user_unittest.cc
|
| index ce12f3f8e1396a44147d683f6f447f635741ceea..fb5c813e9872bc3923378e7059d1e23fc8a92da3 100644
|
| --- a/ash/common/system/user/tray_user_unittest.cc
|
| +++ b/ash/common/system/user/tray_user_unittest.cc
|
| @@ -105,7 +105,7 @@ void TrayUserTest::ShowTrayMenu(ui::test::EventGenerator* generator) {
|
| gfx::Point center = tray()->GetBoundsInScreen().CenterPoint();
|
|
|
| generator->MoveMouseTo(center.x(), center.y());
|
| - EXPECT_FALSE(tray()->IsAnyBubbleVisible());
|
| + EXPECT_FALSE(tray()->IsSystemBubbleVisible());
|
| generator->ClickLeftButton();
|
| }
|
|
|
| @@ -144,7 +144,7 @@ TEST_F(TrayUserTest, SingleUserModeDoesNotAllowAddingUser) {
|
| // Move the mouse over the status area and click to open the status menu.
|
| ui::test::EventGenerator& generator = GetEventGenerator();
|
|
|
| - EXPECT_FALSE(tray()->IsAnyBubbleVisible());
|
| + EXPECT_FALSE(tray()->IsSystemBubbleVisible());
|
|
|
| for (int i = 0; i < delegate()->GetMaximumNumberOfLoggedInUsers(); i++)
|
| EXPECT_EQ(TrayUser::HIDDEN, tray_user(i)->GetStateForTest());
|
| @@ -154,7 +154,7 @@ TEST_F(TrayUserTest, SingleUserModeDoesNotAllowAddingUser) {
|
| ShowTrayMenu(&generator);
|
|
|
| EXPECT_TRUE(tray()->HasSystemBubble());
|
| - EXPECT_TRUE(tray()->IsAnyBubbleVisible());
|
| + EXPECT_TRUE(tray()->IsSystemBubbleVisible());
|
|
|
| for (int i = 0; i < delegate()->GetMaximumNumberOfLoggedInUsers(); i++)
|
| EXPECT_EQ(i == 0 ? TrayUser::SHOWN : TrayUser::HIDDEN,
|
| @@ -212,7 +212,7 @@ TEST_F(TrayUserTest, MultiUserModeDoesNotAllowToAddUser) {
|
| delegate()->set_logged_in_users(j);
|
|
|
| // Verify that nothing is shown.
|
| - EXPECT_FALSE(tray()->IsAnyBubbleVisible());
|
| + EXPECT_FALSE(tray()->IsSystemBubbleVisible());
|
| for (int i = 0; i < max_users; i++)
|
| EXPECT_FALSE(tray_user(i)->GetStateForTest());
|
| if (!UseMd())
|
| @@ -223,7 +223,7 @@ TEST_F(TrayUserTest, MultiUserModeDoesNotAllowToAddUser) {
|
| ShowTrayMenu(&generator);
|
|
|
| EXPECT_TRUE(tray()->HasSystemBubble());
|
| - EXPECT_TRUE(tray()->IsAnyBubbleVisible());
|
| + EXPECT_TRUE(tray()->IsSystemBubbleVisible());
|
| for (int i = 0; i < max_users; i++) {
|
| EXPECT_EQ(i < j ? TrayUser::SHOWN : TrayUser::HIDDEN,
|
| tray_user(i)->GetStateForTest());
|
| @@ -254,7 +254,7 @@ TEST_F(TrayUserTest, MultiUserModeDoesNotAllowToAddUser) {
|
|
|
| // Close and check that everything is deleted.
|
| tray()->CloseSystemBubble();
|
| - EXPECT_FALSE(tray()->IsAnyBubbleVisible());
|
| + EXPECT_FALSE(tray()->IsSystemBubbleVisible());
|
| for (int i = 0; i < delegate()->GetMaximumNumberOfLoggedInUsers(); i++)
|
| EXPECT_EQ(TrayUser::HIDDEN, tray_user(i)->GetStateForTest());
|
| }
|
|
|