Use mojo Shelf interfaces for both mash and classic ash.

ash/mus/window_manager_application.cc

Index: ash/mus/window_manager_application.cc
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
index 282d65f4c6e1ec98c17ff3927084ff3ff63ef983..052987089d806202a7cf664148bc09efe15447c3 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -11,7 +11,6 @@
 #include "ash/common/wm_shell.h"
 #include "ash/mus/accelerators/accelerator_registrar_impl.h"
 #include "ash/mus/native_widget_factory_mus.h"
-#include "ash/mus/shelf_delegate_mus.h"
 #include "ash/mus/wallpaper_delegate_mus.h"
 #include "ash/mus/window_manager.h"
 #include "base/bind.h"
@@ -184,7 +183,6 @@ bool WindowManagerApplication::OnConnect(const shell::Identity& remote_identity,
   mojo_interface_factory::RegisterInterfaces(
       registry, base::ThreadTaskRunnerHandle::Get());
 
-  registry->AddInterface<mojom::ShelfController>(this);
   registry->AddInterface<mojom::WallpaperController>(this);
   registry->AddInterface<ui::mojom::AcceleratorRegistrar>(this);
   if (remote_identity.name() == "service:mash_session") {
@@ -195,14 +193,6 @@ bool WindowManagerApplication::OnConnect(const shell::Identity& remote_identity,
   return true;
 }
 
-void WindowManagerApplication::Create(const shell::Identity& remote_identity,
-                                      mojom::ShelfControllerRequest request) {
-  mojom::ShelfController* shelf_controller =
-      static_cast<ShelfDelegateMus*>(WmShell::Get()->shelf_delegate());
-  DCHECK(shelf_controller);
-  shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
-}
-
 void WindowManagerApplication::Create(
     const ::shell::Identity& remote_identity,
     mojom::WallpaperControllerRequest request) {