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

services/ui/gpu/gpu_service_mus.h

 // 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.
 
 #ifndef SERVICES_UI_GPU_GPU_SERVICE_MUS_H_
 #define SERVICES_UI_GPU_GPU_SERVICE_MUS_H_
 
 #include "base/callback.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/service/gpu_preferences.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "gpu/ipc/common/surface_handle.h"
 #include "gpu/ipc/service/gpu_channel.h"
 #include "gpu/ipc/service/gpu_channel_manager.h"
 #include "gpu/ipc/service/gpu_channel_manager_delegate.h"
 #include "gpu/ipc/service/gpu_config.h"
 #include "gpu/ipc/service/x_util.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace base {
 template <typename T>
 struct DefaultSingletonTraits;
 }
 
-namespace IPC {
-struct ChannelHandle;
-}
-
 namespace gpu {
 class GpuChannelHost;
 class GpuMemoryBufferFactory;
 class SyncPointManager;
 }
 
 namespace media {
 class MediaService;
 }
 
 namespace ui {
 
 class MusGpuMemoryBufferManager;
 
 // TODO(fsamuel): GpuServiceMus is intended to be the Gpu thread within Mus.
 // Similar to GpuChildThread, it is a GpuChannelManagerDelegate and will have a
 // GpuChannelManager.
 class GpuServiceMus : public gpu::GpuChannelManagerDelegate,
                       public gpu::GpuChannelHostFactory,
                       public base::NonThreadSafe {
  public:
-  typedef base::Callback<void(int client_id, const IPC::ChannelHandle&)>
+  typedef base::Callback<void(int client_id, mojo::ScopedMessagePipeHandle)>
       EstablishGpuChannelCallback;
   void EstablishGpuChannel(uint64_t client_tracing_id,
                            bool preempts,
                            bool allow_view_command_buffers,
                            bool allow_real_time_streams,
                            const EstablishGpuChannelCallback& callback);
   gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
       gfx::GpuMemoryBufferId id,
       const gfx::Size& size,
       gfx::BufferFormat format,
@@ skipping 50 matching lines @@
 
   static GpuServiceMus* GetInstance();
 
  private:
   friend struct base::DefaultSingletonTraits<GpuServiceMus>;
 
   GpuServiceMus();
   ~GpuServiceMus() override;
 
   void Initialize();
-  void InitializeOnGpuThread(IPC::ChannelHandle* channel_handle,
+  void InitializeOnGpuThread(mojo::ScopedMessagePipeHandle* channel_handle,
                              base::WaitableEvent* event);
-  void 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);
+  void EstablishGpuChannelOnGpuThread(
+      int client_id,
+      uint64_t client_tracing_id,
+      bool preempts,
+      bool allow_view_command_buffers,
+      bool allow_real_time_streams,
+      mojo::ScopedMessagePipeHandle* channel_handle);
 
   // The next client id.
   int next_client_id_;
 
   // The main thread task runner.
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
 
   // An event that will be signalled when we shutdown.
   base::WaitableEvent shutdown_event_;
 
@@ skipping 21 matching lines @@
 
   // Information about the GPU, such as device and vendor ID.
   gpu::GPUInfo gpu_info_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuServiceMus);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_GPU_GPU_SERVICE_MUS_H_