Remove non-MD code from ShelfButton

ash/test/shelf_view_test_api.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/test/shelf_view_test_api.h"
 
 #include "ash/common/shelf/overflow_button.h"
 #include "ash/common/shelf/shelf_button.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_model.h"
@@ skipping 117 matching lines @@
 }
 
 ShelfTooltipManager* ShelfViewTestAPI::tooltip_manager() {
   return &shelf_view_->tooltip_;
 }
 
 gfx::Size ShelfViewTestAPI::GetPreferredSize() {
   return shelf_view_->GetPreferredSize();
 }
 
 int ShelfViewTestAPI::GetButtonSize() {

[James Cook, 2017/02/28 20:35:11]

nit: Since this and GetButtonSpacing() just return constants, can you remove
these methods entirely and inline the constants in the tests that use them?

[mohsen, 2017/02/28 21:05:16]

Sure, I didn't remove these methods because GetMinimumDragDistance() is also
returning a constant and I wanted to be consistent. However, that one is
returning a private constant, so it makes sense to have an accessor in test api.
These ones are public constants. Done.

-  return GetShelfConstant(SHELF_BUTTON_SIZE);
+  return kShelfButtonSize;
 }
 
 int ShelfViewTestAPI::GetButtonSpacing() {
-  return GetShelfConstant(SHELF_BUTTON_SPACING);
+  return kShelfButtonSpacing;
 }
 
 int ShelfViewTestAPI::GetMinimumDragDistance() const {
   return ShelfView::kMinimumDragDistance;
 }
 
 void ShelfViewTestAPI::ButtonPressed(views::Button* sender,
                                      const ui::Event& event,
                                      views::InkDrop* ink_drop) {
   return shelf_view_->ButtonPressed(sender, event, ink_drop);
@@ skipping 20 matching lines @@
   return shelf_view_->dragged_off_from_overflow_to_shelf_;
 }
 
 ShelfButtonPressedMetricTracker*
 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() {
   return &(shelf_view_->shelf_button_pressed_metric_tracker_);
 }
 
 }  // namespace test
 }  // namespace ash