gpu: Make the mus-gpu client-lib test-friendly.

services/ui/public/cpp/gpu/gpu.cc

 // Copyright 2016 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/gpu/gpu.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/common/scheduling_priority.h"
 #include "mojo/public/cpp/bindings/sync_call_restrictions.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/public/cpp/gpu/client_gpu_memory_buffer_manager.h"
 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
 #include "services/ui/public/interfaces/gpu.mojom.h"
 
 namespace ui {
 
-Gpu::Gpu(service_manager::Connector* connector,
-         const std::string& service_name,
+namespace {
+
+mojom::GpuPtr DefaultFactory(service_manager::Connector* connector,
+                             const std::string& service_name) {
+  mojom::GpuPtr gpu_ptr;
+  connector->BindInterface(service_name, &gpu_ptr);
+  return gpu_ptr;
+}
+
+}  // namespace
+
+Gpu::Gpu(GpuPtrFactory factory,
          scoped_refptr<base::SingleThreadTaskRunner> task_runner)
     : main_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       io_task_runner_(std::move(task_runner)),
-      connector_(connector),
-      service_name_(service_name),
+      factory_(std::move(factory)),
       shutdown_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                       base::WaitableEvent::InitialState::NOT_SIGNALED) {
   DCHECK(main_task_runner_);
-  DCHECK(connector_);
-  mojom::GpuPtr gpu_ptr;
-  connector_->BindInterface(service_name_, &gpu_ptr);
   gpu_memory_buffer_manager_ =
-      base::MakeUnique<ClientGpuMemoryBufferManager>(std::move(gpu_ptr));
+      base::MakeUnique<ClientGpuMemoryBufferManager>(factory_.Run());
   if (!io_task_runner_) {
     io_thread_.reset(new base::Thread("GPUIOThread"));
     base::Thread::Options thread_options(base::MessageLoop::TYPE_IO, 0);
     thread_options.priority = base::ThreadPriority::NORMAL;
     CHECK(io_thread_->StartWithOptions(thread_options));
     io_task_runner_ = io_thread_->task_runner();
   }
 }
 
 Gpu::~Gpu() {
   DCHECK(IsMainThread());
   shutdown_event_.Signal();
   if (gpu_channel_)
     gpu_channel_->DestroyChannel();
 }
 
 // static
 std::unique_ptr<Gpu> Gpu::Create(
     service_manager::Connector* connector,
     const std::string& service_name,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
-  return base::WrapUnique(
-      new Gpu(connector, service_name, std::move(task_runner)));
+  GpuPtrFactory factory =
+      base::BindRepeating(&DefaultFactory, connector, service_name);
+  return base::WrapUnique(new Gpu(std::move(factory), std::move(task_runner)));
 }
 
 scoped_refptr<cc::ContextProvider> Gpu::CreateContextProvider(
     scoped_refptr<gpu::GpuChannelHost> gpu_channel) {
   int32_t stream_id = 0;
   gpu::SchedulingPriority stream_priority = gpu::SchedulingPriority::kNormal;
 
   constexpr bool automatic_flushes = false;
   constexpr bool support_locking = false;
 
@@ skipping 19 matching lines @@
   scoped_refptr<gpu::GpuChannelHost> channel = GetGpuChannel();
   if (channel) {
     main_task_runner_->PostTask(FROM_HERE,
                                 base::Bind(callback, std::move(channel)));
     return;
   }
   establish_callbacks_.push_back(callback);
   if (gpu_)
     return;
 
-  connector_->BindInterface(service_name_, &gpu_);
+  gpu_ = factory_.Run();
   gpu_->EstablishGpuChannel(
       base::Bind(&Gpu::OnEstablishedGpuChannel, base::Unretained(this)));
 }
 
 scoped_refptr<gpu::GpuChannelHost> Gpu::EstablishGpuChannelSync() {
   DCHECK(IsMainThread());
   if (GetGpuChannel())
     return gpu_channel_;
 
   int client_id = 0;
   mojo::ScopedMessagePipeHandle channel_handle;
   gpu::GPUInfo gpu_info;
-  connector_->BindInterface(service_name_, &gpu_);
-
+  gpu_ = factory_.Run();
   mojo::SyncCallRestrictions::ScopedAllowSyncCall allow_sync_call;
   if (!gpu_->EstablishGpuChannel(&client_id, &channel_handle, &gpu_info)) {
     DLOG(WARNING)
         << "Channel encountered error while establishing gpu channel.";
     return nullptr;
   }
   OnEstablishedGpuChannel(client_id, std::move(channel_handle), gpu_info);
   return gpu_channel_;
 }
 
@@ skipping 49 matching lines @@
   MojoResult result = mojo::UnwrapSharedMemoryHandle(
       std::move(handle), &platform_handle, &shared_memory_size, &readonly);
   if (result != MOJO_RESULT_OK)
     return nullptr;
   DCHECK_EQ(shared_memory_size, size);
 
   return base::MakeUnique<base::SharedMemory>(platform_handle, readonly);
 }
 
 }  // namespace ui