ash: Move shelf alignment and auto-hide calls from Shell to Shelf

ash/shelf/shelf_widget_unittest.cc

 // Copyright (c) 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/shelf/shelf_widget.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 24 matching lines @@
   return GetShelfWidget()->shelf_layout_manager();
 }
 
 } // namespace
 
 typedef test::AshTestBase ShelfWidgetTest;
 
 void TestLauncherAlignment(aura::Window* root,
                            wm::ShelfAlignment alignment,
                            const std::string& expected) {
-  Shell::GetInstance()->SetShelfAlignment(alignment, root);
+  Shelf::ForWindow(root)->SetAlignment(alignment);
   display::Screen* screen = display::Screen::GetScreen();
   EXPECT_EQ(expected,
             screen->GetDisplayNearestWindow(root).work_area().ToString());
 }
 
 #if defined(OS_WIN) && !defined(USE_ASH)
 // TODO(msw): Broken on Windows. http://crbug.com/584038
 #define MAYBE_TestAlignment DISABLED_TestAlignment
 #else
 #define MAYBE_TestAlignment TestAlignment
 #endif
 TEST_F(ShelfWidgetTest, MAYBE_TestAlignment) {
-  Shelf* shelf = Shelf::ForPrimaryDisplay();
   UpdateDisplay("400x400");
-  ASSERT_TRUE(shelf);
   {
     SCOPED_TRACE("Single Bottom");
     TestLauncherAlignment(Shell::GetPrimaryRootWindow(),
                           wm::SHELF_ALIGNMENT_BOTTOM, "0,0 400x353");
   }
   {
     SCOPED_TRACE("Single Locked");
     TestLauncherAlignment(Shell::GetPrimaryRootWindow(),
                           wm::SHELF_ALIGNMENT_BOTTOM_LOCKED, "0,0 400x353");
   }
@@ skipping 385 matching lines @@
 }
 
 TEST_F(ShelfWidgetTestWithDelegate, CreateLockedShelf) {
   // The auto hide state 'HIDDEN' is returned for any non-auto-hide behavior.
   TestCreateShelfWithInitialValues(wm::SHELF_ALIGNMENT_BOTTOM_LOCKED,
                                    SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
                                    SHELF_VISIBLE, SHELF_AUTO_HIDE_HIDDEN);
 }
 
 }  // namespace ash