Fix shelf alignment and auto-hide initialization.

ash/mus/shell_delegate_mus.cc

Index: ash/mus/shell_delegate_mus.cc
diff --git a/ash/mus/shell_delegate_mus.cc b/ash/mus/shell_delegate_mus.cc
index 053e0cb64aa2db38120eec4edb76b3d8c6852c7c..a94d858e8eaa0f577496c35542c4cd92a727fda8 100644
--- a/ash/mus/shell_delegate_mus.cc
+++ b/ash/mus/shell_delegate_mus.cc
@@ -84,12 +84,8 @@ class SessionStateDelegateStub : public SessionStateDelegate {
 
 }  // namespace
 
-ShellDelegateMus::ShellDelegateMus(
-    service_manager::Connector* connector,
-    std::unique_ptr<SystemTrayDelegate> system_tray_delegate_for_test)
-    : connector_(connector),
-      system_tray_delegate_for_test_(std::move(system_tray_delegate_for_test)) {
-}
+ShellDelegateMus::ShellDelegateMus(service_manager::Connector* connector)
+    : connector_(connector) {}
 
 ShellDelegateMus::~ShellDelegateMus() {}
 
@@ -148,8 +144,6 @@ ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
 }
 
 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
-  if (system_tray_delegate_for_test_)
-    return system_tray_delegate_for_test_.release();
   return new SystemTrayDelegateMus();
 }