Fix shelf alignment and auto-hide initialization.

ash/common/test/test_shelf_delegate.h

Index: ash/common/test/test_shelf_delegate.h
diff --git a/ash/common/test/test_shelf_delegate.h b/ash/common/test/test_shelf_delegate.h
index 575a808fa02043259aacdb21cd988ec6e832b056..cb71bc5df40d14325d56e9b0e7883c49ed7aaa10 100644
--- a/ash/common/test/test_shelf_delegate.h
+++ b/ash/common/test/test_shelf_delegate.h
@@ -14,16 +14,15 @@
 #include "base/macros.h"
 
 namespace ash {
-
-class ShelfModel;
-
 namespace test {
 
+class ShelfInitializer;
+
 // Test implementation of ShelfDelegate.
 // Tests may create icons for windows by calling AddShelfItem().
 class TestShelfDelegate : public ShelfDelegate, public WmWindowObserver {
  public:
-  explicit TestShelfDelegate(ShelfModel* model);
+  TestShelfDelegate();
   ~TestShelfDelegate() override;
 
   // Adds a ShelfItem for the given |window|. The ShelfItem's status will be
@@ -69,7 +68,7 @@ class TestShelfDelegate : public ShelfDelegate, public WmWindowObserver {
 
   static TestShelfDelegate* instance_;
 
-  ShelfModel* model_;
+  std::unique_ptr<ShelfInitializer> shelf_initializer_;
 
   std::set<std::string> pinned_apps_;