Fix spacing issues on Ash shelf

ash/shelf/shelf_view_unittest.cc

 // Copyright (c) 2012 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/common/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 1890 matching lines @@
       ShelfItemDelegate::kExistingWindowActivated);
   SimulateClick(browser_index_);
 
   histogram_tester.ExpectTotalCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, 1);
 }
 
 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();
   }
 
   void CheckAppListButtonIsInBounds() {
     gfx::Rect visible_bounds = shelf_view_->GetVisibleItemsBoundsInScreen();
     gfx::Rect app_list_button_bounds =
         shelf_view_->GetAppListButton()->GetBoundsInScreen();
     EXPECT_TRUE(visible_bounds.Contains(app_list_button_bounds));
   }
 
@@ skipping 13 matching lines @@
   CheckAllItemsAreInBounds();
   // Same for overflow case.
   while (!test_api_->IsOverflowButtonVisible()) {
     AddAppShortcut();
   }
   test_api_->RunMessageLoopUntilAnimationsDone();
   CheckAllItemsAreInBounds();
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, ShelfViewTextDirectionTest, testing::Bool());
-
-// This test seems to be flaky with material design shelf (see
-// https://crbug.com/625671) and even in non-material mode (see
-// https://crbug.com/619344 which is fixed using a hack). Disabling for now.
-// TODO(mohsen): Hopefully, the fix for https://crbug.com/634128 that fixes
-// issues with shelf spacing, will fix this flake, too. Re-enable when that
-// issue is fixed.
-INSTANTIATE_TEST_CASE_P(DISABLED_VisibleBounds,
+INSTANTIATE_TEST_CASE_P(VisibleBounds,
                         ShelfViewVisibleBoundsTest,
                         testing::Bool());
 
 namespace {
 
 // An InkDrop implementation that wraps another InkDrop instance to keep track
 // of state changes requested on it. Note that this will only track transitions
 // routed through AnimateToState() and not the ones performed directly on the
 // ripple inside the contained |ink_drop|.
 class InkDropSpy : public views::InkDrop {
@@ skipping 1194 matching lines @@
                 IsEmpty());
 
     ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
   }
 }
 
 #endif  // !defined(OS_WIN)
 
 }  // namespace test
 }  // namespace ash