services/ui: Get rid of IPC::ChannelHandle type converter

services/ui/gpu/gpu_service_mus.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/gpu/gpu_service_mus.h"
 
 #include "base/memory/shared_memory.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 24 matching lines @@
 #endif
 
 namespace ui {
 namespace {
 
 const int kLocalGpuChannelClientId = 1;
 const uint64_t kLocalGpuChannelClientTracingId = 1;
 
 void EstablishGpuChannelDone(
     int client_id,
-    const IPC::ChannelHandle* channel_handle,
+    mojo::ScopedMessagePipeHandle* channel_handle,
     const GpuServiceMus::EstablishGpuChannelCallback& callback) {
-  callback.Run(channel_handle ? client_id : -1, *channel_handle);
+  callback.Run(client_id, std::move(*channel_handle));
 }
 }
 
 GpuServiceMus::GpuServiceMus()
     : next_client_id_(kLocalGpuChannelClientId),
       main_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       shutdown_event_(base::WaitableEvent::ResetPolicy::MANUAL,
                       base::WaitableEvent::InitialState::NOT_SIGNALED),
       gpu_thread_("GpuThread"),
       io_thread_("GpuIOThread") {
@@ skipping 11 matching lines @@
 
 void GpuServiceMus::EstablishGpuChannel(
     uint64_t client_tracing_id,
     bool preempts,
     bool allow_view_command_buffers,
     bool allow_real_time_streams,
     const EstablishGpuChannelCallback& callback) {
   DCHECK(CalledOnValidThread());
 
   if (!gpu_channel_manager_) {
-    callback.Run(-1, IPC::ChannelHandle());
+    callback.Run(-1, mojo::ScopedMessagePipeHandle());
     return;
   }
 
   const int client_id = ++next_client_id_;
-  IPC::ChannelHandle* channel_handle = new IPC::ChannelHandle;
+  auto* channel_handle = new mojo::ScopedMessagePipeHandle;
   gpu_thread_.task_runner()->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&GpuServiceMus::EstablishGpuChannelOnGpuThread,
                  base::Unretained(this), client_id, client_tracing_id, preempts,
                  allow_view_command_buffers, allow_real_time_streams,
                  base::Unretained(channel_handle)),
       base::Bind(&EstablishGpuChannelDone, client_id,
                  base::Owned(channel_handle), callback));
 }
 
@@ skipping 67 matching lines @@
 
   thread_options = base::Thread::Options(base::MessageLoop::TYPE_IO, 0);
   thread_options.priority = base::ThreadPriority::NORMAL;
 #if defined(OS_ANDROID)
   // TODO(reveman): Remove this in favor of setting it explicitly for each type
   // of process.
   thread_options.priority = base::ThreadPriority::DISPLAY;
 #endif
   CHECK(io_thread_.StartWithOptions(thread_options));
 
-  IPC::ChannelHandle channel_handle;
+  mojo::ScopedMessagePipeHandle channel_handle;
   base::WaitableEvent event(base::WaitableEvent::ResetPolicy::MANUAL,
                             base::WaitableEvent::InitialState::NOT_SIGNALED);
   gpu_thread_.task_runner()->PostTask(
       FROM_HERE, base::Bind(&GpuServiceMus::InitializeOnGpuThread,
                             base::Unretained(this), &channel_handle, &event));
   event.Wait();
 
   gpu_memory_buffer_manager_local_.reset(
       new MusGpuMemoryBufferManager(this, kLocalGpuChannelClientId));
   gpu_channel_local_ = gpu::GpuChannelHost::Create(
-      this, kLocalGpuChannelClientId, gpu_info_, channel_handle,
-      &shutdown_event_, gpu_memory_buffer_manager_local_.get());
+      this, kLocalGpuChannelClientId, gpu_info_,
+      IPC::ChannelHandle(channel_handle.release()), &shutdown_event_,
+      gpu_memory_buffer_manager_local_.get());
 }
 
-void GpuServiceMus::InitializeOnGpuThread(IPC::ChannelHandle* channel_handle,
-                                          base::WaitableEvent* event) {
+void GpuServiceMus::InitializeOnGpuThread(
+    mojo::ScopedMessagePipeHandle* channel_handle,
+    base::WaitableEvent* event) {
   gpu_info_.video_decode_accelerator_capabilities =
       media::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences_);
   gpu_info_.video_encode_accelerator_supported_profiles =
       media::GpuVideoEncodeAccelerator::GetSupportedProfiles(gpu_preferences_);
   gpu_info_.jpeg_decode_accelerator_supported =
       media::GpuJpegDecodeAccelerator::IsSupported();
 
 #if defined(USE_OZONE)
   // TODO(rjkroege): Must plumb the shell::Connector* to here and pass into
   // ozone.
@@ skipping 34 matching lines @@
       allow_view_command_buffers, allow_real_time_streams, channel_handle);
   event->Signal();
 }
 
 void GpuServiceMus::EstablishGpuChannelOnGpuThread(
     int client_id,
     uint64_t client_tracing_id,
     bool preempts,
     bool allow_view_command_buffers,
     bool allow_real_time_streams,
-    IPC::ChannelHandle* channel_handle) {
+    mojo::ScopedMessagePipeHandle* channel_handle) {
   if (gpu_channel_manager_) {
-    *channel_handle = gpu_channel_manager_->EstablishChannel(
+    auto handle = gpu_channel_manager_->EstablishChannel(
         client_id, client_tracing_id, preempts, allow_view_command_buffers,
         allow_real_time_streams);
+    channel_handle->reset(handle.mojo_handle);
     media_service_->AddChannel(client_id);
   }
 }
 
 bool GpuServiceMus::IsMainThread() {
   return main_task_runner_->BelongsToCurrentThread();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 GpuServiceMus::GetIOThreadTaskRunner() {
   return io_thread_.task_runner();
 }
 
 std::unique_ptr<base::SharedMemory> GpuServiceMus::AllocateSharedMemory(
     size_t size) {
   std::unique_ptr<base::SharedMemory> shm(new base::SharedMemory());
   if (!shm->CreateAnonymous(size))
     return std::unique_ptr<base::SharedMemory>();
   return shm;
 }
 
 // static
 GpuServiceMus* GpuServiceMus::GetInstance() {
   return base::Singleton<GpuServiceMus,
                          base::LeakySingletonTraits<GpuServiceMus>>::get();
 }
 
 }  // namespace ui