(Merge to M-51) Revise the shelf alignment locking mechanism.

ash/test/shelf_test_api.cc

Index: ash/test/shelf_test_api.cc
diff --git a/ash/test/shelf_test_api.cc b/ash/test/shelf_test_api.cc
deleted file mode 100644
index 83bc841fd0eaf30b0fb8e60ab22594844876369f..0000000000000000000000000000000000000000
--- a/ash/test/shelf_test_api.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2013 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_test_api.h"
-
-#include "ash/shelf/shelf.h"
-
-namespace ash {
-namespace test {
-
-ShelfTestAPI::ShelfTestAPI(Shelf* shelf) : shelf_(shelf) {}
-
-ShelfTestAPI::~ShelfTestAPI() {}
-
-ShelfView* ShelfTestAPI::shelf_view() { return shelf_->shelf_view_; }
-
-void ShelfTestAPI::SetShelfDelegate(ShelfDelegate* delegate) {
-  shelf_->delegate_ = delegate;
-}
-
-}  // namespace test
-}  // namespace ash