Shelf Cleanup AlternateShelfLayout P1 Attempt 3

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/shelf/overflow_button.h"
 #include "ash/shelf/shelf_button.h"
+#include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_view.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/view_model.h"
 
 namespace {
 
 // A class used to wait for animations.
 class TestAPIAnimationObserver : public views::BoundsAnimatorObserver {
@@ skipping 80 matching lines @@
 
 OverflowBubble* ShelfViewTestAPI::overflow_bubble() {
   return shelf_view_->overflow_bubble_.get();
 }
 
 gfx::Size ShelfViewTestAPI::GetPreferredSize() {
   return shelf_view_->GetPreferredSize();
 }
 
 int ShelfViewTestAPI::GetButtonSize() {
-  return shelf_view_->GetButtonSize();
+  return kShelfButtonSize;
 }
 
 int ShelfViewTestAPI::GetButtonSpacing() {
-  return shelf_view_->GetButtonSpacing();
+  return kShelfButtonSpacing;
 }
 
 bool ShelfViewTestAPI::SameDragType(ShelfItemType typea,
                                     ShelfItemType typeb) const {
   return shelf_view_->SameDragType(typea, typeb);
 }
 
 void ShelfViewTestAPI::SetShelfDelegate(ShelfDelegate* delegate) {
   shelf_view_->delegate_ = delegate;
 }
 
 gfx::Rect ShelfViewTestAPI::GetBoundsForDragInsertInScreen() {
   return shelf_view_->GetBoundsForDragInsertInScreen();
 }
 
 bool ShelfViewTestAPI::IsRippedOffFromShelf() {
   return shelf_view_->dragged_off_shelf_;
 }
 
 bool ShelfViewTestAPI::DraggedItemFromOverflowToShelf() {
     return shelf_view_->dragged_off_from_overflow_to_shelf_;
 }
 
 }  // namespace test
 }  // namespace ash