Remove non-MD code from ShelfButton

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 612 matching lines @@
     gfx::Point rip_off_point(center_point_of_drag_item.x(), 0);
     generator.MoveMouseTo(rip_off_point);
     test_api_for_overflow.RunMessageLoopUntilAnimationsDone();
     ASSERT_TRUE(test_api_for_overflow.IsRippedOffFromShelf());
     ASSERT_FALSE(test_api_for_overflow.DraggedItemFromOverflowToShelf());
 
     // Move a dragged item into Shelf at |drop_index|.
     int drop_index = 1;
     gfx::Point drop_point =
         test_api_->GetButton(drop_index)->GetBoundsInScreen().CenterPoint();
-    int item_width = test_api_for_overflow.GetButtonSize();
     // To insert at |drop_index|, more smaller x-axis value of |drop_point|
     // should be used.
-    gfx::Point modified_drop_point(drop_point.x() - item_width / 4,
+    gfx::Point modified_drop_point(drop_point.x() - kShelfButtonSize / 4,
                                    drop_point.y());
     generator.MoveMouseTo(modified_drop_point);
     test_api_for_overflow.RunMessageLoopUntilAnimationsDone();
     test_api_->RunMessageLoopUntilAnimationsDone();
     ASSERT_TRUE(test_api_for_overflow.IsRippedOffFromShelf());
     ASSERT_TRUE(test_api_for_overflow.DraggedItemFromOverflowToShelf());
 
     if (cancel)
       drag_button->OnMouseCaptureLost();
     else
@@ skipping 942 matching lines @@
 
   // Show overflow bubble.
   test_api_->ShowOverflowBubble();
   ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
 
   ShelfViewTestAPI test_for_overflow_view(
       test_api_->overflow_bubble()->shelf_view());
 
   int ripped_index = test_for_overflow_view.GetLastVisibleIndex();
   gfx::Size bubble_size = test_for_overflow_view.GetPreferredSize();
-  int item_width = test_for_overflow_view.GetButtonSize() +
-                   test_for_overflow_view.GetButtonSpacing();
+  int item_width = kShelfButtonSize + kShelfButtonSpacing;
 
   ui::test::EventGenerator& generator = GetEventGenerator();
   ShelfButton* button = test_for_overflow_view.GetButton(ripped_index);
   // Rip off the last visible item.
   gfx::Point start_point = button->GetBoundsInScreen().CenterPoint();
   gfx::Point rip_off_point(start_point.x(), 0);
   generator.MoveMouseTo(start_point.x(), start_point.y());
   base::RunLoop().RunUntilIdle();
   generator.PressLeftButton();
   base::RunLoop().RunUntilIdle();
@@ skipping 31 matching lines @@
   UpdateDisplay("400x300");
 
   EXPECT_EQ(2, model_->item_count());
 
   AddButtonsUntilOverflow();
 
   // Show overflow bubble.
   test_api_->ShowOverflowBubble();
   ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
 
-  int item_width = test_api_->GetButtonSize() + test_api_->GetButtonSpacing();
+  int item_width = kShelfButtonSize + kShelfButtonSpacing;
   OverflowBubbleView* bubble_view = test_api_->overflow_bubble()->bubble_view();
   OverflowBubbleViewTestAPI bubble_view_api(bubble_view);
 
   // Add more buttons until OverflowBubble is scrollable and it has 3 invisible
   // items.
   while (bubble_view_api.GetContentsSize().width() <
          (bubble_view->GetContentsBounds().width() + 3 * item_width)) {
     AddAppShortcut();
   }
 
@@ skipping 1347 matching lines @@
   EXPECT_EQ(views::InkDropState::ACTIVATED,
             overflow_button_ink_drop_->GetTargetInkDropState());
   EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
               IsEmpty());
 
   ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
 }
 
 }  // namespace test
 }  // namespace ash