ash: Move alignment and autohide behavior from Shelf to WmShelf

ash/test/ash_test_base.h

 // Copyright (c) 2012 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_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 51 matching lines @@
 
 class AshTestBase : public testing::Test {
  public:
   AshTestBase();
   ~AshTestBase() override;
 
   // 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();
 
   // Update the display configuration as given in |display_specs|.
   // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details.
   void UpdateDisplay(const std::string& display_specs);
 
   // Returns a root Window. Usually this is the active root Window, but that
   // method can return NULL sometimes, and in those cases, we fall back on the
   // primary root Window.
@@ skipping 45 matching lines @@
 
   // Returns the rotation currently active for the internal display.
   static display::Display::Rotation GetCurrentInternalDisplayRotation();
 
   // Proxy to AshTestHelper::SupportsMultipleDisplays().
   static bool SupportsMultipleDisplays();
 
   // 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
   // command line switches.
   void set_material_mode(MaterialDesignController::Mode material_mode) {
     CHECK(!setup_called_);
     material_mode_ = material_mode;
   }
 
   AshTestHelper* ash_test_helper() { return ash_test_helper_.get(); }
@@ skipping 45 matching lines @@
   ~NoSessionAshTestBase() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_