Shelf Cleanup AlternateShelfLayout P1 Attempt 3

ash/test/shelf_view_test_api.cc

Index: ash/test/shelf_view_test_api.cc
diff --git a/ash/test/shelf_view_test_api.cc b/ash/test/shelf_view_test_api.cc
index d3d545c9e5cb99bd82ce5eee15f21b44bb2d5a7e..d190f954c9fd7c278598ad1b3b3f91be106cafc0 100644
--- a/ash/test/shelf_view_test_api.cc
+++ b/ash/test/shelf_view_test_api.cc
@@ -6,6 +6,7 @@
 
 #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"
@@ -106,11 +107,11 @@ gfx::Size ShelfViewTestAPI::GetPreferredSize() {
 }
 
 int ShelfViewTestAPI::GetButtonSize() {
-  return shelf_view_->GetButtonSize();
+  return kShelfButtonSize;
 }
 
 int ShelfViewTestAPI::GetButtonSpacing() {
-  return shelf_view_->GetButtonSpacing();
+  return kShelfButtonSpacing;
 }
 
 bool ShelfViewTestAPI::SameDragType(ShelfItemType typea,