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

content/renderer/mus/render_widget_mus_connection.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/mus/render_widget_mus_connection.h"
 
 #include <map>
 
 #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"
 #include "services/ui/public/interfaces/surface.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 
 namespace content {
 
 namespace {
 
@@ skipping 13 matching lines @@
   if (window_surface_binding_) {
     compositor_mus_connection_->AttachSurfaceOnMainThread(
         std::move(window_surface_binding_));
   }
 }
 
 std::unique_ptr<cc::OutputSurface>
 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_)));
   if (compositor_mus_connection_) {
     compositor_mus_connection_->AttachSurfaceOnMainThread(
         std::move(window_surface_binding_));
   }
   return surface;
 }
 
@@ skipping 110 matching lines @@
   // previous event.
   // DCHECK(pending_ack_.is_null());
   pending_ack_ = ack;
   // TODO(fsamuel, sadrul): Track real latency info.
   ui::LatencyInfo latency_info;
   input_handler_->HandleInputEvent(*input_event, latency_info,
                                    DISPATCH_TYPE_BLOCKING);
 }
 
 }  // namespace content