Impl mus::mojom::GpuService to enable using Chrome IPC version gpu CmdBuf in mus

ui/views/mus/surface_binding.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 "ui/views/mus/surface_binding.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_local.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/software_output_device.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "components/mus/public/cpp/context_provider.h"
+#include "components/mus/public/cpp/gpu_service.h"
 #include "components/mus/public/cpp/output_surface.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/interfaces/gpu.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/shell/public/cpp/connector.h"
 #include "ui/views/mus/window_tree_host_mus.h"
 
@@ skipping 60 matching lines @@
   }
   return (*window_map)[connection];
 }
 
 std::unique_ptr<cc::OutputSurface>
 SurfaceBinding::PerConnectionState::CreateOutputSurface(
     mus::Window* window,
     mus::mojom::SurfaceType surface_type) {
   if (gpu_.encountered_error())
     return nullptr;
-  // TODO(sky): figure out lifetime here. Do I need to worry about the return
-  // value outliving this?
-  mus::mojom::CommandBufferPtr cb;
-  gpu_->CreateOffscreenGLES2Context(GetProxy(&cb));
-
+  mojo::ScopedMessagePipeHandle scoped_handle;
+  if (!mus::GpuService::UseChromeGpuCommandBuffer()) {
+    // TODO(sky): figure out lifetime here. Do I need to worry about the return
+    // value outliving this?
+    mus::mojom::CommandBufferPtr cb;
+    gpu_->CreateOffscreenGLES2Context(GetProxy(&cb));
+    scoped_handle = cb.PassInterface().PassHandle();
+  } else {
+    mus::GpuService::Initialize(connector_);
+  }
   scoped_refptr<cc::ContextProvider> context_provider(
-      new mus::ContextProvider(cb.PassInterface().PassHandle()));
+      new mus::ContextProvider(std::move(scoped_handle)));
   return base::WrapUnique(new mus::OutputSurface(
       context_provider, window->RequestSurface(surface_type)));
 }
 
 SurfaceBinding::PerConnectionState::PerConnectionState(
     shell::Connector* connector,
     mus::WindowTreeConnection* connection)
     : connector_(connector), connection_(connection) {}
 
 SurfaceBinding::PerConnectionState::~PerConnectionState() {
@@ skipping 26 matching lines @@
       surface_type_(surface_type),
       state_(PerConnectionState::Get(connector, window->connection())) {}
 
 SurfaceBinding::~SurfaceBinding() {}
 
 std::unique_ptr<cc::OutputSurface> SurfaceBinding::CreateOutputSurface() {
   return state_->CreateOutputSurface(window_, surface_type_);
 }
 
 }  // namespace views