Move more from WmShell to Shell

ash/common/test/ash_test.cc

Index: ash/common/test/ash_test.cc
diff --git a/ash/common/test/ash_test.cc b/ash/common/test/ash_test.cc
index 5f7550658e7ad114ba3475f1c84425fe9b8e4e14..57dca5884b596ce0f014b8b11f8813f9e17abc81 100644
--- a/ash/common/test/ash_test.cc
+++ b/ash/common/test/ash_test.cc
@@ -12,6 +12,7 @@
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
+#include "ash/shell.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "ui/aura/window.h"
@@ -46,7 +47,7 @@ SystemTray* AshTest::GetPrimarySystemTray() {
 // static
 test::TestSystemTrayDelegate* AshTest::GetSystemTrayDelegate() {
   return static_cast<test::TestSystemTrayDelegate*>(
-      WmShell::Get()->system_tray_delegate());
+      Shell::Get()->system_tray_delegate());
 }
 
 void AshTest::UpdateDisplay(const std::string& display_spec) {