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

ui/views/mus/surface_context_factory.cc

Index: ui/views/mus/surface_context_factory.cc
diff --git a/ui/views/mus/surface_context_factory.cc b/ui/views/mus/surface_context_factory.cc
index 5a697eeeb4ce24f422db6d9f3589b05a7ac0655a..046a607586ed5c80c65ed575839e00962756da8c 100644
--- a/ui/views/mus/surface_context_factory.cc
+++ b/ui/views/mus/surface_context_factory.cc
@@ -8,7 +8,6 @@
 #include "cc/output/output_surface.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "cc/surfaces/surface_id_allocator.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
 #include "services/ui/public/cpp/window.h"
 #include "ui/compositor/reflector.h"
 #include "ui/gl/gl_bindings.h"
@@ -28,11 +27,9 @@
 }  // namespace
 
 SurfaceContextFactory::SurfaceContextFactory(
-    shell::Connector* connector,
     ui::Window* window,
     ui::mojom::SurfaceType surface_type)
-    : surface_binding_(connector, window, surface_type),
-      next_surface_id_namespace_(1u) {}
+    : surface_binding_(window, surface_type), next_surface_id_namespace_(1u) {}
 
 SurfaceContextFactory::~SurfaceContextFactory() {}