Revert of services/ui: Revert CLs that broke Windows.

ash/mus/non_client_frame_controller.cc

Index: ash/mus/non_client_frame_controller.cc
diff --git a/ash/mus/non_client_frame_controller.cc b/ash/mus/non_client_frame_controller.cc
index 9d25d0248288338cdd29d6a240e875870187b5d7..913ba2b2ae9a7b1cb62a7d198182ad064877cee6 100644
--- a/ash/mus/non_client_frame_controller.cc
+++ b/ash/mus/non_client_frame_controller.cc
@@ -112,13 +112,9 @@
 class WmNativeWidgetMus : public views::NativeWidgetMus {
  public:
   WmNativeWidgetMus(views::internal::NativeWidgetDelegate* delegate,
-                    shell::Connector* connector,
                     ui::Window* window,
                     ui::WindowManagerClient* window_manager_client)
-      : NativeWidgetMus(delegate,
-                        connector,
-                        window,
-                        ui::mojom::SurfaceType::UNDERLAY),
+      : NativeWidgetMus(delegate, window, ui::mojom::SurfaceType::UNDERLAY),
         window_manager_client_(window_manager_client) {}
   ~WmNativeWidgetMus() override {}
 
@@ -238,7 +234,7 @@
   params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
   params.delegate = this;
   params.native_widget =
-      new WmNativeWidgetMus(widget_, connector, window, window_manager_client);
+      new WmNativeWidgetMus(widget_, window, window_manager_client);
   widget_->Init(params);
 
   parent->AddChild(window);