Revert of ash/mash: Add a mus-client that sets up ash to provide the system ui for mash.

mash/shell/shell_application_delegate.cc

Index: mash/shell/shell_application_delegate.cc
diff --git a/mash/shell/shell_application_delegate.cc b/mash/shell/shell_application_delegate.cc
index 7b40ca8fb76eb61f39274731468c2838f72eaafe..032ad13f7c206b9f98ecf649c79c5ca2fdcdb453 100644
--- a/mash/shell/shell_application_delegate.cc
+++ b/mash/shell/shell_application_delegate.cc
@@ -5,15 +5,8 @@
 #include "mash/shell/shell_application_delegate.h"
 
 #include "base/bind.h"
-#include "base/command_line.h"
 #include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/shell.h"
-
-namespace {
-
-const char kUseAshSysui[] = "use-ash-sysui";
-
-}  // namespace
 
 namespace mash {
 namespace shell {
@@ -29,7 +22,8 @@
   shell_ = shell;
   StartBrowserDriver();
   StartWindowManager();
-  StartSystemUI();
+  StartWallpaper();
+  StartShelf();
   StartQuickLaunch();
 }
 
@@ -76,19 +70,6 @@
       "mojo:desktop_wm",
       base::Bind(&ShellApplicationDelegate::StartWindowManager,
                  base::Unretained(this)));
-}
-
-void ShellApplicationDelegate::StartSystemUI() {
-  static bool use_ash =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(kUseAshSysui);
-  if (use_ash) {
-    StartRestartableService("mojo:ash_sysui",
-                            base::Bind(&ShellApplicationDelegate::StartSystemUI,
-                                       base::Unretained(this)));
-  } else {
-    StartWallpaper();
-    StartShelf();
-  }
 }
 
 void ShellApplicationDelegate::StartWallpaper() {