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

services/ui/public/cpp/gpu_service.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_service.h"
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
@@ skipping 133 matching lines @@
 
   // In browser process, EstablishGpuChannelSync() is only used by testing &
   // GpuProcessTransportFactory::GetGLHelper(). For GetGLHelper(), it expects
   // the gpu channel has been established, so it should not reach here.
   // For testing, the  asyc method should not be used.
   // In renderer process, we only use EstablishGpuChannelSync().
   // So the gpu_service_ should be null here.
   DCHECK(!gpu_service_);
 
   int client_id = 0;
-  mojom::ChannelHandlePtr channel_handle;
+  mojo::ScopedMessagePipeHandle channel_handle;
   gpu::GPUInfo gpu_info;
   connector_->ConnectToInterface("mojo:ui", &gpu_service_);
   {
     base::AutoUnlock auto_unlock(lock_);
     mojo::SyncCallRestrictions::ScopedAllowSyncCall allow_sync_call;
     if (!gpu_service_->EstablishGpuChannel(&client_id, &channel_handle,
                                            &gpu_info)) {
       DLOG(WARNING)
           << "Channel encountered error while establishing gpu channel.";
       return;
     }
   }
   const bool locked = true;
   EstablishGpuChannelOnMainThreadDone(locked, client_id,
                                       std::move(channel_handle), gpu_info);
 }
 
 void GpuService::EstablishGpuChannelOnMainThreadDone(
     bool locked,
     int client_id,
-    mojom::ChannelHandlePtr channel_handle,
+    mojo::ScopedMessagePipeHandle channel_handle,
     const gpu::GPUInfo& gpu_info) {
   DCHECK(IsMainThread());
   scoped_refptr<gpu::GpuChannelHost> gpu_channel;
   if (client_id) {
     // TODO(penghuang): Get the real gpu info from mus.
     gpu_channel = gpu::GpuChannelHost::Create(
         this, client_id, gpu::GPUInfo(),
-        channel_handle.To<IPC::ChannelHandle>(), &shutdown_event_,
+        IPC::ChannelHandle(channel_handle.release()), &shutdown_event_,

[dcheng, 2016/08/17 19:38:29]

Nit: I think std::move() might work here.

[Peng, 2016/08/17 19:59:17]

Just tried. std::move() doesn't work. It is because IP::ChannelHandle() only
accepts mojo::MessagePipeHandle, it dons't
accept mojo::ScopedMessagePipeHandle.

         gpu_memory_buffer_manager_.get());
   }
 
   auto auto_lock = base::WrapUnique<base::AutoLock>(
       locked ? nullptr : new base::AutoLock(lock_));
   DCHECK(is_establishing_);
   DCHECK(!gpu_channel_);
 
   is_establishing_ = false;
   gpu_channel_ = gpu_channel;
@@ skipping 27 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