Merge 198585 "Regression issue with "ShouldHop", the UpdateState..."

ash/launcher/launcher_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/launcher/launcher_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/launcher/launcher.h"
@@ skipping 359 matching lines @@
 
   LauncherModel* model_;
   internal::LauncherView* launcher_view_;
 
   scoped_ptr<LauncherViewTestAPI> test_api_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LauncherViewTest);
 };
 
-// Checks that the icon positions do not shift with a state change.
-TEST_F(LauncherViewTest, NoStateChangeIconMovement) {
-  LauncherID last_added = AddAppShortcut();
-  internal::LauncherButton* button = GetButtonByID(last_added);
-  EXPECT_EQ(button->state(), ash::internal::LauncherButton::STATE_NORMAL);
-  gfx::Rect old_bounds = button->GetIconBounds();
-
-  button->AddState(ash::internal::LauncherButton::STATE_HOVERED);
-  gfx::Rect hovered_bounds = button->GetIconBounds();
-  EXPECT_EQ(old_bounds.ToString(), hovered_bounds.ToString());
-}
-
 // Adds browser button until overflow and verifies that the last added browser
 // button is hidden.
 TEST_F(LauncherViewTest, AddBrowserUntilOverflow) {
   // All buttons should be visible.
   ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
             test_api_->GetButtonCount());
 
   // Add tabbed browser until overflow.
   int items_added = 0;
   LauncherID last_added = AddTabbedBrowser();
@@ skipping 504 matching lines @@
   // All buttons should be visible.
   ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
             test_api_->GetButtonCount());
   gfx::Rect ideal_bounds_0 = test_api_->GetIdealBoundsByIndex(0);
   gfx::Rect ideal_bounds_1 = test_api_->GetIdealBoundsByIndex(1);
   EXPECT_GT(ideal_bounds_0.width(), ideal_bounds_1.width());
 }
 
 }  // namespace test
 }  // namespace ash