| Index: ash/system/web_notification/web_notification_tray_unittest.cc
|
| diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc
|
| index 10a8fa94d09dc36f933d9d59dc004fef7d488806..31a003c25d2fc2fb5eafd76e0a0509159822b287 100644
|
| --- a/ash/system/web_notification/web_notification_tray_unittest.cc
|
| +++ b/ash/system/web_notification/web_notification_tray_unittest.cc
|
| @@ -482,14 +482,14 @@ TEST_P(WebNotificationTrayTest, TouchFeedback) {
|
| generator.set_current_location(center_point);
|
|
|
| generator.PressTouch();
|
| - EXPECT_TRUE(tray->draw_background_as_active());
|
| + EXPECT_TRUE(tray->is_active());
|
|
|
| generator.ReleaseTouch();
|
| - EXPECT_TRUE(tray->draw_background_as_active());
|
| + EXPECT_TRUE(tray->is_active());
|
| EXPECT_TRUE(tray->IsMessageCenterBubbleVisible());
|
|
|
| generator.GestureTapAt(center_point);
|
| - EXPECT_FALSE(tray->draw_background_as_active());
|
| + EXPECT_FALSE(tray->is_active());
|
| EXPECT_FALSE(tray->IsMessageCenterBubbleVisible());
|
| }
|
|
|
| @@ -507,14 +507,14 @@ TEST_P(WebNotificationTrayTest, TouchFeedbackCancellation) {
|
| generator.set_current_location(center_point);
|
|
|
| generator.PressTouch();
|
| - EXPECT_TRUE(tray->draw_background_as_active());
|
| + EXPECT_TRUE(tray->is_active());
|
|
|
| gfx::Point out_of_bounds(bounds.x() - 1, center_point.y());
|
| generator.MoveTouch(out_of_bounds);
|
| - EXPECT_FALSE(tray->draw_background_as_active());
|
| + EXPECT_FALSE(tray->is_active());
|
|
|
| generator.ReleaseTouch();
|
| - EXPECT_FALSE(tray->draw_background_as_active());
|
| + EXPECT_FALSE(tray->is_active());
|
| EXPECT_FALSE(tray->IsMessageCenterBubbleVisible());
|
| }
|
|
|
|
|