Revert of Shelf Cleanup (- binary files)

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 1b4e453ea13f8b8aecfc7a7b62d19496d59fb3f8..2147ada50b94e166973c5d2789f386534bfccd65 100644
--- a/ash/test/shelf_view_test_api.cc
+++ b/ash/test/shelf_view_test_api.cc
@@ -6,7 +6,6 @@
 
 #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"
@@ -109,11 +108,11 @@
 }
 
 int ShelfViewTestAPI::GetButtonSize() {
-  return kShelfButtonSize;
+  return shelf_view_->GetButtonSize();
 }
 
 int ShelfViewTestAPI::GetButtonSpacing() {
-  return kShelfButtonSpacing;
+  return shelf_view_->GetButtonSpacing();
 }
 
 bool ShelfViewTestAPI::SameDragType(ShelfItemType typea,