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

content/renderer/mus/render_widget_mus_connection.cc

Index: content/renderer/mus/render_widget_mus_connection.cc
diff --git a/content/renderer/mus/render_widget_mus_connection.cc b/content/renderer/mus/render_widget_mus_connection.cc
index ad7233cfd5673f3ae475c6131f583cfc05675604..727b34d797de1f07c7508399dc3a18b75abc4d61 100644
--- a/content/renderer/mus/render_widget_mus_connection.cc
+++ b/content/renderer/mus/render_widget_mus_connection.cc
@@ -8,11 +8,9 @@
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
-#include "content/public/common/mojo_shell_connection.h"
 #include "content/renderer/mus/compositor_mus_connection.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
-#include "services/shell/public/cpp/connector.h"
 #include "services/ui/public/cpp/context_provider.h"
 #include "services/ui/public/cpp/output_surface.h"
 #include "services/ui/public/interfaces/command_buffer.mojom.h"
@@ -46,8 +44,7 @@
 RenderWidgetMusConnection::CreateOutputSurface() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!window_surface_binding_);
-  scoped_refptr<cc::ContextProvider> context_provider(new ui::ContextProvider(
-      ChildThread::Get()->GetMojoShellConnection()->GetConnector()));
+  scoped_refptr<cc::ContextProvider> context_provider(new ui::ContextProvider);
 
   std::unique_ptr<cc::OutputSurface> surface(new ui::OutputSurface(
       context_provider, ui::WindowSurface::Create(&window_surface_binding_)));