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

services/ui/public/cpp/gles2_context.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/gles2_context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/shared_memory_limits.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
+#include "gpu/ipc/client/gpu_channel_host.h"
 #include "mojo/public/cpp/system/core.h"
 #include "services/ui/common/gpu_service.h"
 #include "services/ui/public/cpp/command_buffer_client_impl.h"
 #include "services/ui/public/interfaces/command_buffer.mojom.h"
 #include "services/ui/public/interfaces/gpu_service.mojom.h"
 #include "url/gurl.h"
 
 namespace ui {
 
 GLES2Context::GLES2Context() {}
 
 GLES2Context::~GLES2Context() {}
 
-bool GLES2Context::Initialize(const std::vector<int32_t>& attribs) {
+bool GLES2Context::Initialize(GpuService* gpu_service) {
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_host =
-      GpuService::GetInstance()->EstablishGpuChannelSync();
+      gpu_service->EstablishGpuChannelSync();
   if (!gpu_channel_host)
     return false;
   gpu::SurfaceHandle surface_handle = gfx::kNullAcceleratedWidget;
   // TODO(penghuang): support shared group.
   gpu::CommandBufferProxyImpl* shared_command_buffer = nullptr;
   gpu::GpuStreamId stream_id = gpu::GpuStreamId::GPU_STREAM_DEFAULT;
   gpu::GpuStreamPriority stream_priority = gpu::GpuStreamPriority::NORMAL;
   gpu::gles2::ContextCreationAttribHelper attributes;
   // TODO(penghuang): figure a useful active_url.
   GURL active_url;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner =
       base::ThreadTaskRunnerHandle::Get();
-  if (!attributes.Parse(attribs))
-    return false;
   command_buffer_proxy_impl_ = gpu::CommandBufferProxyImpl::Create(
       std::move(gpu_channel_host), surface_handle, shared_command_buffer,
       stream_id, stream_priority, attributes, active_url,
       std::move(task_runner));
   if (!command_buffer_proxy_impl_)
     return false;
   gpu::CommandBuffer* command_buffer = command_buffer_proxy_impl_.get();
   gpu::GpuControl* gpu_control = command_buffer_proxy_impl_.get();
 
   constexpr gpu::SharedMemoryLimits default_limits;
@@ skipping 16 matching lines @@
   if (!implementation_->Initialize(default_limits.start_transfer_buffer_size,
                                    default_limits.min_transfer_buffer_size,
                                    default_limits.max_transfer_buffer_size,
                                    default_limits.mapped_memory_reclaim_limit))
     return false;
   return true;
 }
 
 // static
 std::unique_ptr<GLES2Context> GLES2Context::CreateOffscreenContext(
-    const std::vector<int32_t>& attribs) {
+    GpuService* gpu_service) {
   std::unique_ptr<GLES2Context> gles2_context(new GLES2Context);
-  if (!gles2_context->Initialize(attribs))
+  if (!gles2_context->Initialize(gpu_service))
     gles2_context.reset();
   return gles2_context;
 }
 
 }  // namespace ui