| Index: ash/shelf/shelf_view_unittest.cc
|
| diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
|
| index 0bc25fdfb3fb50e3c6b5314e6f818fb14cec96ff..1f47596f842c36cc69d148edf9e0f59d3f5d6cd5 100644
|
| --- a/ash/shelf/shelf_view_unittest.cc
|
| +++ b/ash/shelf/shelf_view_unittest.cc
|
| @@ -1908,21 +1908,17 @@ TEST_F(ShelfViewTest,
|
| class ShelfViewVisibleBoundsTest : public ShelfViewTest,
|
| public testing::WithParamInterface<bool> {
|
| public:
|
| - ShelfViewVisibleBoundsTest() : text_direction_change_(GetParam()) {
|
| - // TODO(jamescook): This test fails unless the system update icon is
|
| - // showing, which used to be the default. However, it only fails on the
|
| - // trybots, and only in the case where the overflow button is showing.
|
| - // See http://crbug.com/619344
|
| - TestSystemTrayDelegate::SetSystemUpdateRequired(true);
|
| - }
|
| + ShelfViewVisibleBoundsTest() : text_direction_change_(GetParam()) {}
|
|
|
| void CheckAllItemsAreInBounds() {
|
| gfx::Rect visible_bounds = shelf_view_->GetVisibleItemsBoundsInScreen();
|
| gfx::Rect shelf_bounds = shelf_view_->GetBoundsInScreen();
|
| EXPECT_TRUE(shelf_bounds.Contains(visible_bounds));
|
| for (int i = 0; i < test_api_->GetButtonCount(); ++i)
|
| - if (ShelfButton* button = test_api_->GetButton(i))
|
| - EXPECT_TRUE(visible_bounds.Contains(button->GetBoundsInScreen()));
|
| + if (ShelfButton* button = test_api_->GetButton(i)) {
|
| + if (button->visible())
|
| + EXPECT_TRUE(visible_bounds.Contains(button->GetBoundsInScreen()));
|
| + }
|
| CheckAppListButtonIsInBounds();
|
| }
|
|
|
|
|