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

services/ui/public/cpp/output_surface.cc

 // Copyright 2014 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 "services/ui/public/cpp/output_surface.h"
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_client.h"
 #include "services/ui/public/cpp/context_provider.h"
 #include "services/ui/public/cpp/window_surface.h"
 
 namespace ui {
 
-OutputSurface::OutputSurface(std::unique_ptr<ui::WindowSurface> surface)
-    : cc::OutputSurface(make_scoped_refptr(new ContextProvider()),
+OutputSurface::OutputSurface(GpuService* gpu_service,
+                             std::unique_ptr<ui::WindowSurface> surface)
+    : cc::OutputSurface(make_scoped_refptr(new ContextProvider(gpu_service)),
                         nullptr,
                         nullptr),
       surface_(std::move(surface)) {
   capabilities_.delegated_rendering = true;
 }
 
 OutputSurface::~OutputSurface() {}
 
 bool OutputSurface::BindToClient(cc::OutputSurfaceClient* client) {
   surface_->BindToThread();
@@ skipping 30 matching lines @@
     ui::WindowSurface* surface,
     mojo::Array<cc::ReturnedResource> resources) {
   ReclaimResources(resources.To<cc::ReturnedResourceArray>());
 }
 
 void OutputSurface::SwapBuffersComplete() {
   client_->DidSwapBuffersComplete();
 }
 
 }  // namespace ui