ash: Move alignment and autohide behavior from Shelf to WmShelf

ash/test/ash_test_base.h

Index: ash/test/ash_test_base.h
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index 43bdb178b43ff082a6b8e4b5de83756c4a331a9e..63e1cf8fe979763e0bb6ccdecb77bf8134244dcc 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -69,6 +69,9 @@ class AshTestBase : public testing::Test {
   void SetUp() override;
   void TearDown() override;
 
+  // Returns the WmShelf for the primary display.
+  static WmShelf* GetPrimaryShelf();
+
   // Returns the system tray on the primary display.
   static SystemTray* GetPrimarySystemTray();
 
@@ -134,9 +137,6 @@ class AshTestBase : public testing::Test {
   // Proxy to AshTestHelper::SupportsHostWindowResize().
   static bool SupportsHostWindowResize();
 
-  // Returns the WmShelf for the primary display.
-  static WmShelf* GetPrimaryShelf();
-
   void set_start_session(bool start_session) { start_session_ = start_session; }
 
   // Sets material mode for the test. This will override material mode set via