services/ui: Inject GpuService instance where needed, instead of singleton.

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"
@@ skipping 22 matching lines @@
       routing_id_, render_thread->GetCompositorMainThreadTaskRunner(),
       render_thread->compositor_task_runner(), std::move(request),
       render_thread->input_handler_manager());
   if (window_surface_binding_) {
     compositor_mus_connection_->AttachSurfaceOnMainThread(
         std::move(window_surface_binding_));
   }
 }
 
 std::unique_ptr<cc::OutputSurface>
-RenderWidgetMusConnection::CreateOutputSurface() {
+RenderWidgetMusConnection::CreateOutputSurface(ui::GpuService* gpu_service) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!window_surface_binding_);
 
   std::unique_ptr<cc::OutputSurface> surface(new ui::OutputSurface(
-      ui::WindowSurface::Create(&window_surface_binding_)));
+      gpu_service, ui::WindowSurface::Create(&window_surface_binding_)));
   if (compositor_mus_connection_) {
     compositor_mus_connection_->AttachSurfaceOnMainThread(
         std::move(window_surface_binding_));
   }
   return surface;
 }
 
 // static
 RenderWidgetMusConnection* RenderWidgetMusConnection::Get(int routing_id) {
   auto it = g_connections.Get().find(routing_id);
@@ skipping 107 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