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

ash/wm/panels/panel_window_resizer_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/wm/common/panels/panel_window_resizer.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_model.h"
@@ skipping 221 matching lines @@
     return;
 
  std::unique_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0)));
  DetachReattachTest(window.get(), 0, -1);
 }
 
 TEST_F(PanelWindowResizerTest, PanelDetachReattachLeft) {
  if (!SupportsHostWindowResize())
     return;
 
-  ash::Shell* shell = ash::Shell::GetInstance();
-  shell->SetShelfAlignment(wm::SHELF_ALIGNMENT_LEFT,
-                           shell->GetPrimaryRootWindow());
-  std::unique_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0)));
-  DetachReattachTest(window.get(), 1, 0);
+ Shelf::ForPrimaryDisplay()->SetAlignment(wm::SHELF_ALIGNMENT_LEFT);
+ std::unique_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0)));
+ DetachReattachTest(window.get(), 1, 0);
 }
 
 TEST_F(PanelWindowResizerTest, PanelDetachReattachRight) {
   if (!SupportsHostWindowResize())
     return;
 
-  ash::Shell* shell = ash::Shell::GetInstance();
-  shell->SetShelfAlignment(wm::SHELF_ALIGNMENT_RIGHT,
-                           shell->GetPrimaryRootWindow());
+  Shelf::ForPrimaryDisplay()->SetAlignment(wm::SHELF_ALIGNMENT_RIGHT);
   std::unique_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0)));
   DetachReattachTest(window.get(), -1, 0);
 }
 
 // Tests that a drag continues when the shelf is hidden. This occurs as part of
 // the animation when switching profiles. http://crbug.com/393047.
 TEST_F(PanelWindowResizerTest, DetachThenHideShelf) {
   if (!SupportsHostWindowResize())
     return;
   std::unique_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0)));
@@ skipping 222 matching lines @@
   if (!SupportsHostWindowResize())
     return;
 
   DragAlongShelfReorder(base::i18n::IsRTL() ? 1 : -1, 0);
 }
 
 TEST_F(PanelWindowResizerTest, DragReordersPanelsVertical) {
   if (!SupportsHostWindowResize())
     return;
 
-  ash::Shell* shell = ash::Shell::GetInstance();
-  shell->SetShelfAlignment(wm::SHELF_ALIGNMENT_LEFT,
-                           shell->GetPrimaryRootWindow());
+  Shelf::ForPrimaryDisplay()->SetAlignment(wm::SHELF_ALIGNMENT_LEFT);
   DragAlongShelfReorder(0, -1);
 }
 
 // Tests that panels can have transient children of different types.
 // The transient children should be reparented in sync with the panel.
 TEST_P(PanelWindowResizerTransientTest, PanelWithTransientChild) {
   if (!SupportsHostWindowResize())
     return;
 
   std::unique_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0)));
@@ skipping 55 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelWindowResizerTextDirectionTest,
                         testing::Bool());
 INSTANTIATE_TEST_CASE_P(NormalPanelPopup,
                         PanelWindowResizerTransientTest,
                         testing::Values(ui::wm::WINDOW_TYPE_NORMAL,
                                         ui::wm::WINDOW_TYPE_PANEL,
                                         ui::wm::WINDOW_TYPE_POPUP));
 
 }  // namespace ash