Use mojo Shelf interfaces for both mash and classic ash.

chrome/browser/ui/ash/ash_init.cc

Index: chrome/browser/ui/ash/ash_init.cc
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index 6e7ebd3923de3569a1c1d80fb7127d7fdd9bb1ba..5532f53e95bd37a5f25c7400fda694e0ac89ae40 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -26,7 +26,6 @@
 #include "chrome/browser/ui/ash/chrome_shell_content_state.h"
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h"
 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/accelerometer/accelerometer_reader.h"
@@ -97,11 +96,6 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {
   ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
 }
 
-void InitializeMash() {
-  DCHECK(!ash::Shell::HasInstance());
-  ChromeLauncherControllerMus::CreateInstance()->Init();
-}
-
 void CloseAsh() {
   if (ash::Shell::HasInstance()) {
     ash::Shell::DeleteInstance();