ash: Move alignment and autohide behavior from Shelf to WmShelf

ash/test/ash_test_base.cc

Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index e7ee5ccd9d780731e302ce1aad85991467d02a36..767a0add927b5f657700fb607c811a25e97dadf4 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -176,6 +176,14 @@ void AshTestBase::TearDown() {
 }
 
 // static
+WmShelf* AshTestBase::GetPrimaryShelf() {
+  return WmShell::Get()
+      ->GetPrimaryRootWindow()
+      ->GetRootWindowController()
+      ->GetShelf();
+}
+
+// static
 SystemTray* AshTestBase::GetPrimarySystemTray() {
   return Shell::GetInstance()->GetPrimarySystemTray();
 }
@@ -211,14 +219,6 @@ bool AshTestBase::SupportsHostWindowResize() {
   return AshTestHelper::SupportsHostWindowResize();
 }
 
-// static
-WmShelf* AshTestBase::GetPrimaryShelf() {
-  return WmShell::Get()
-      ->GetPrimaryRootWindow()
-      ->GetRootWindowController()
-      ->GetShelf();
-}
-
 void AshTestBase::UpdateDisplay(const std::string& display_specs) {
   DisplayManagerTestApi().UpdateDisplay(display_specs);
 }