| Index: ash/shelf/shelf_view_unittest.cc
|
| diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
|
| index a2a083e4d12aa783f46446af33bf6bbbc3b942c9..17f84dbf1a357bbb7ee39a018880e1e3b0437d5b 100644
|
| --- a/ash/shelf/shelf_view_unittest.cc
|
| +++ b/ash/shelf/shelf_view_unittest.cc
|
| @@ -309,7 +309,7 @@ class ShelfViewTest : public AshTestBase {
|
| shelf_view_ = ShelfTestAPI(shelf).shelf_view();
|
|
|
| // The bounds should be big enough for 4 buttons + overflow chevron.
|
| - shelf_view_->SetBounds(0, 0, 500, kShelfSize);
|
| + shelf_view_->SetBounds(0, 0, 500, GetShelfLayoutConstant(SHELF_SIZE));
|
|
|
| test_api_.reset(new ShelfViewTestAPI(shelf_view_));
|
| test_api_->SetAnimationDuration(1); // Speeds up animation for test.
|
| @@ -1584,7 +1584,7 @@ TEST_F(ShelfViewTest, ResizeDuringOverflowAddAnimation) {
|
|
|
| // Resize shelf view with that animation running and stay overflown.
|
| gfx::Rect bounds = shelf_view_->bounds();
|
| - bounds.set_width(bounds.width() - kShelfSize);
|
| + bounds.set_width(bounds.width() - GetShelfLayoutConstant(SHELF_SIZE));
|
| shelf_view_->SetBoundsRect(bounds);
|
| ASSERT_TRUE(test_api_->IsOverflowButtonVisible());
|
|
|
| @@ -1719,7 +1719,8 @@ TEST_F(ShelfViewTest, CheckDragInsertBoundsWithMultiMonitor) {
|
| ShelfTestAPI(secondary_shelf).shelf_view();
|
|
|
| // The bounds should be big enough for 4 buttons + overflow chevron.
|
| - shelf_view_for_secondary->SetBounds(0, 0, 500, kShelfSize);
|
| + shelf_view_for_secondary->SetBounds(0, 0, 500,
|
| + GetShelfLayoutConstant(SHELF_SIZE));
|
|
|
| ShelfViewTestAPI test_api_for_secondary(shelf_view_for_secondary);
|
| // Speeds up animation for test.
|
|
|