Fix shelf alignment and auto-hide initialization.

ash/common/test/test_shelf_delegate.h

 // 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.
 
 #ifndef ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_
 #define ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_window_observer.h"
 #include "base/macros.h"
 
 namespace ash {
+namespace test {
 
-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
   // STATUS_CLOSED.
   void AddShelfItem(WmWindow* window);
 
   // Adds a ShelfItem for the given |window| and adds a mapping from the added
   // ShelfItem's ShelfID to the given |app_id|. The ShelfItem's status will be
   // STATUS_CLOSED.
   void AddShelfItem(WmWindow* window, const std::string& app_id);
@@ skipping 25 matching lines @@
 
  private:
   // Adds a mapping from a ShelfID to an app id.
   void AddShelfIDToAppIDMapping(ShelfID shelf_id, const std::string& app_id);
 
   // Removes the mapping from a ShelfID to an app id.
   void RemoveShelfIDToAppIDMapping(ShelfID shelf_id);
 
   static TestShelfDelegate* instance_;
 
-  ShelfModel* model_;
+  std::unique_ptr<ShelfInitializer> shelf_initializer_;
 
   std::set<std::string> pinned_apps_;
 
   // Tracks the ShelfID to app id mappings.
   std::map<ShelfID, std::string> shelf_id_to_app_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(TestShelfDelegate);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_