Move yet more from WmShell to Shell

ash/common/mojo_interface_factory.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/mojo_interface_factory.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/cast_config_controller.h"
@@ skipping 42 matching lines @@
   Shell::Get()->media_controller()->BindRequest(std::move(request));
 }
 
 void BindNewWindowControllerRequestOnMainThread(
     mojom::NewWindowControllerRequest request) {
   Shell::Get()->new_window_controller()->BindRequest(std::move(request));
 }
 
 void BindSessionControllerRequestOnMainThread(
     mojom::SessionControllerRequest request) {
-  WmShell::Get()->session_controller()->BindRequest(std::move(request));
+  Shell::Get()->session_controller()->BindRequest(std::move(request));
 }
 
 void BindShelfRequestOnMainThread(mojom::ShelfControllerRequest request) {
-  WmShell::Get()->shelf_controller()->BindRequest(std::move(request));
+  Shell::Get()->shelf_controller()->BindRequest(std::move(request));
 }
 
 void BindShutdownControllerRequestOnMainThread(
     mojom::ShutdownControllerRequest request) {
   WmShell::Get()->shutdown_controller()->BindRequest(std::move(request));
 }
 
 void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) {
   Shell::Get()->system_tray_controller()->BindRequest(std::move(request));
 }
@@ skipping 45 matching lines @@
                          main_thread_task_runner);
   registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread),
                          main_thread_task_runner);
   registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread),
                          main_thread_task_runner);
 }
 
 }  // namespace mojo_interface_factory
 
 }  // namespace ash