Move more from WmShell to Shell

ash/common/mojo_interface_factory.cc

Index: ash/common/mojo_interface_factory.cc
diff --git a/ash/common/mojo_interface_factory.cc b/ash/common/mojo_interface_factory.cc
index c8c174f1bb8a5dd76b23bfa4576695da7ffcd491..51d16b6fa685ba34ce1932c1990bb8dc2cd064c2 100644
--- a/ash/common/mojo_interface_factory.cc
+++ b/ash/common/mojo_interface_factory.cc
@@ -39,12 +39,12 @@ void BindAppListRequestOnMainThread(app_list::mojom::AppListRequest request) {
 }
 
 void BindCastConfigOnMainThread(mojom::CastConfigRequest request) {
-  WmShell::Get()->cast_config()->BindRequest(std::move(request));
+  Shell::Get()->cast_config()->BindRequest(std::move(request));
 }
 
 void BindLocaleNotificationControllerOnMainThread(
     mojom::LocaleNotificationControllerRequest request) {
-  WmShell::Get()->locale_notification_controller()->BindRequest(
+  Shell::Get()->locale_notification_controller()->BindRequest(
       std::move(request));
 }
 
@@ -73,7 +73,7 @@ void BindShutdownControllerRequestOnMainThread(
 }
 
 void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) {
-  WmShell::Get()->system_tray_controller()->BindRequest(std::move(request));
+  Shell::Get()->system_tray_controller()->BindRequest(std::move(request));
 }
 
 void BindTouchViewRequestOnMainThread(mojom::TouchViewManagerRequest request) {