Fix shelf alignment and auto-hide initialization.

ash/mus/window_manager.cc

Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index 19db97b64c5d7d3374f7786876d5540ae3502ce2..ce905d7b293578c5c780cb37bb54754476b2f8e6 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -9,7 +9,6 @@
 #include <utility>
 
 #include "ash/common/session/session_controller.h"
-#include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_window.h"
@@ -190,11 +189,11 @@ void WindowManager::CreateShell(
   DCHECK(!created_shell_);
   created_shell_ = true;
   ShellInitParams init_params;
-  WmShellMus* wm_shell =
-      new WmShellMus(WmWindow::Get(window_tree_host->window()),
-                     base::MakeUnique<ShellDelegateMus>(
-                         connector_, std::move(system_tray_delegate_for_test_)),
-                     this, pointer_watcher_event_router_.get());
+  WmShellMus* wm_shell = new WmShellMus(
+      WmWindow::Get(window_tree_host->window()),
+      shell_delegate_for_test_ ? std::move(shell_delegate_for_test_)
+                               : base::MakeUnique<ShellDelegateMus>(connector_),
+      this, pointer_watcher_event_router_.get());
   init_params.primary_window_tree_host = window_tree_host.release();
   init_params.wm_shell = wm_shell;
   init_params.blocking_pool = blocking_pool_.get();