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

ash/test/shelf_test_api.h

Index: ash/test/shelf_test_api.h
diff --git a/ash/test/shelf_test_api.h b/ash/test/shelf_test_api.h
index 94e86fb56ab2cfd3239aaa80592c253c3b621323..78d099e1150ee7e0ae8784fde5882eb07d9893d0 100644
--- a/ash/test/shelf_test_api.h
+++ b/ash/test/shelf_test_api.h
@@ -5,28 +5,25 @@
 #ifndef ASH_TEST_SHELF_TEST_API_H_
 #define ASH_TEST_SHELF_TEST_API_H_
 
+#include "ash/shelf/shelf.h"
 #include "base/macros.h"
 
 namespace ash {
-
-class Shelf;
-class ShelfDelegate;
-class ShelfView;
-
 namespace test {
 
 // Use the api in this class to access private members of Shelf.
 class ShelfTestAPI {
  public:
-  explicit ShelfTestAPI(Shelf* shelf);
+  explicit ShelfTestAPI(Shelf* shelf) : shelf_(shelf) {}
+  ~ShelfTestAPI() {}
 
-  ~ShelfTestAPI();
+  ShelfView* shelf_view() { return shelf_->shelf_view_; }
 
-  // An accessor for |shelf_view|.
-  ShelfView* shelf_view();
+  ShelfLockingManager* shelf_locking_manager() {
+    return &shelf_->shelf_locking_manager_;
+  }
 
-  // Set ShelfDelegate.
-  void SetShelfDelegate(ShelfDelegate* delegate);
+  void set_delegate(ShelfDelegate* delegate) { shelf_->delegate_ = delegate; }
 
  private:
   Shelf* shelf_;