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

ui/views/mus/window_manager_connection.cc

Index: ui/views/mus/window_manager_connection.cc
diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc
index 4d1c3098374d19faf06f09b18d282db5ae2a7339..9a0e5cfbdb75100b6ffe016e088ba109d3d487ce 100644
--- a/ui/views/mus/window_manager_connection.cc
+++ b/ui/views/mus/window_manager_connection.cc
@@ -54,15 +54,6 @@
   return window_tree_connection_->NewTopLevelWindow(&properties);
 }
 
-NativeWidget* WindowManagerConnection::CreateNativeWidgetMus(
-    const Widget::InitParams& init_params,
-    internal::NativeWidgetDelegate* delegate) {
-  std::map<std::string, std::vector<uint8_t>> properties;
-  NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &properties);
-  return new NativeWidgetMus(delegate, shell_, NewWindow(properties),
-                             mus::mojom::SurfaceType::DEFAULT);
-}
-
 WindowManagerConnection::WindowManagerConnection(mojo::Shell* shell)
     : shell_(shell), window_tree_connection_(nullptr) {
   window_tree_connection_.reset(
@@ -71,8 +62,9 @@
   screen_.reset(new ScreenMus(this));
   screen_->Init(shell);
 
-  ViewsDelegate::GetInstance()->set_native_widget_factory(base::Bind(
-      &WindowManagerConnection::CreateNativeWidgetMus, base::Unretained(this)));
+  ViewsDelegate::GetInstance()->set_native_widget_factory(
+      base::Bind(&WindowManagerConnection::CreateNativeWidget,
+                 base::Unretained(this)));
 }
 
 WindowManagerConnection::~WindowManagerConnection() {
@@ -91,4 +83,13 @@
     NativeWidgetMus::NotifyFrameChanged(window_tree_connection_.get());
 }
 
+NativeWidget* WindowManagerConnection::CreateNativeWidget(
+    const Widget::InitParams& init_params,
+    internal::NativeWidgetDelegate* delegate) {
+  std::map<std::string, std::vector<uint8_t>> properties;
+  NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &properties);
+  return new NativeWidgetMus(delegate, shell_, NewWindow(properties),
+                             mus::mojom::SurfaceType::DEFAULT);
+}
+
 }  // namespace views