Fix shelf alignment and auto-hide initialization.

ash/mus/test/wm_test_helper.cc

Index: ash/mus/test/wm_test_helper.cc
diff --git a/ash/mus/test/wm_test_helper.cc b/ash/mus/test/wm_test_helper.cc
index 8bfb0e4f60cfb65207d940597087477b0e8db32a..d15d43c1dd02915c08790ab3e5ce4964c8baa7d3 100644
--- a/ash/mus/test/wm_test_helper.cc
+++ b/ash/mus/test/wm_test_helper.cc
@@ -6,13 +6,13 @@
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/test/material_design_controller_test_api.h"
-#include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/test/wm_shell_test_api.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
+#include "ash/test/test_shell_delegate.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ -102,8 +102,8 @@ void WmTestHelper::Init() {
       kMaxNumberThreads, kThreadNamePrefix);
 
   window_manager_app_->window_manager_.reset(new WindowManager(nullptr));
-  window_manager_app_->window_manager()->system_tray_delegate_for_test_ =
-      base::MakeUnique<test::TestSystemTrayDelegate>();
+  window_manager_app_->window_manager()->shell_delegate_for_test_ =
+      base::MakeUnique<test::TestShellDelegate>();
 
   window_tree_client_setup_.InitForWindowManager(
       window_manager_app_->window_manager_.get(),