services/ui: Revert CLs that broke Windows.

services/ui/public/cpp/lib/gles2_context.cc

Index: services/ui/public/cpp/lib/gles2_context.cc
diff --git a/services/ui/public/cpp/lib/gles2_context.cc b/services/ui/public/cpp/lib/gles2_context.cc
index 9338a54658405296ab5795205700b18983e665be..ed0f7ad82b5686ef298328f4d0433382f2157fbe 100644
--- a/services/ui/public/cpp/lib/gles2_context.cc
+++ b/services/ui/public/cpp/lib/gles2_context.cc
@@ -14,6 +14,7 @@
 #include "gpu/command_buffer/client/transfer_buffer.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 #include "mojo/public/cpp/system/core.h"
+#include "services/shell/public/cpp/connector.h"
 #include "services/ui/common/gpu_service.h"
 #include "services/ui/public/cpp/lib/command_buffer_client_impl.h"
 #include "services/ui/public/interfaces/command_buffer.mojom.h"
@@ -26,31 +27,49 @@ GLES2Context::GLES2Context() {}
 
 GLES2Context::~GLES2Context() {}
 
-bool GLES2Context::Initialize(const std::vector<int32_t>& attribs) {
-  scoped_refptr<gpu::GpuChannelHost> gpu_channel_host =
-      GpuService::GetInstance()->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();
+bool GLES2Context::Initialize(const std::vector<int32_t>& attribs,
+                              shell::Connector* connector) {
+  gpu::CommandBuffer* command_buffer = nullptr;
+  gpu::GpuControl* gpu_control = nullptr;
+  // TODO(penghuang): Use type gpu::gles2::ContextCreationAttribHelper for
+  // attribs.
+  if (!ui::GpuService::UseChromeGpuCommandBuffer()) {
+    mojom::GpuPtr gpu;
+    connector->ConnectToInterface("mojo:ui", &gpu);
+    mojom::CommandBufferPtr command_buffer_ptr;
+    gpu->CreateOffscreenGLES2Context(GetProxy(&command_buffer_ptr));
+    command_buffer_client_impl_.reset(
+        new CommandBufferClientImpl(attribs, std::move(command_buffer_ptr)));
+    if (!command_buffer_client_impl_->Initialize())
+      return false;
+    command_buffer = command_buffer_client_impl_.get();
+    gpu_control = command_buffer_client_impl_.get();
+  } else {
+    scoped_refptr<gpu::GpuChannelHost> gpu_channel_host =
+        GpuService::GetInstance()->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;
+    command_buffer = command_buffer_proxy_impl_.get();
+    gpu_control = command_buffer_proxy_impl_.get();
+  }
 
   constexpr gpu::SharedMemoryLimits default_limits;
   gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer));
@@ -79,9 +98,10 @@ bool GLES2Context::Initialize(const std::vector<int32_t>& attribs) {
 
 // static
 std::unique_ptr<GLES2Context> GLES2Context::CreateOffscreenContext(
-    const std::vector<int32_t>& attribs) {
+    const std::vector<int32_t>& attribs,
+    shell::Connector* connector) {
   std::unique_ptr<GLES2Context> gles2_context(new GLES2Context);
-  if (!gles2_context->Initialize(attribs))
+  if (!gles2_context->Initialize(attribs, connector))
     gles2_context.reset();
   return gles2_context;
 }