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

content/renderer/mus/render_widget_mus_connection.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_
 #define CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "cc/output/output_surface.h"
 #include "content/common/content_export.h"
 #include "content/renderer/input/render_widget_input_handler_delegate.h"
 #include "content/renderer/mus/compositor_mus_connection.h"
 #include "services/ui/public/cpp/window_surface.h"
 
+namespace ui {
+class GpuService;
+}
+
 namespace content {
 
 class InputHandlerManager;
 
 // Use on main thread.
 class CONTENT_EXPORT RenderWidgetMusConnection
     : public RenderWidgetInputHandlerDelegate {
  public:
   // Bind to a WindowTreeClient request.
   void Bind(mojo::InterfaceRequest<ui::mojom::WindowTreeClient> request);
 
   // Create a cc output surface.
-  std::unique_ptr<cc::OutputSurface> CreateOutputSurface();
+  std::unique_ptr<cc::OutputSurface> CreateOutputSurface(ui::GpuService* gpu);
 
   static RenderWidgetMusConnection* Get(int routing_id);
 
   // Get the connection from a routing_id, if the connection doesn't exist,
   // a new connection will be created.
   static RenderWidgetMusConnection* GetOrCreate(int routing_id);
 
  private:
   friend class CompositorMusConnection;
   friend class CompositorMusConnectionTest;
@@ skipping 32 matching lines @@
 
   // Used to verify single threaded access.
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetMusConnection);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_