Introduce Display Compositor mojo interface. Use InProcessContextProvider.

services/ui/ws/gpu_service_proxy.h

Index: services/ui/ws/gpu_service_proxy.h
diff --git a/services/ui/ws/gpu_service_proxy.h b/services/ui/ws/gpu_service_proxy.h
index f5d8446173665a22047830fe3655377dfcd9b1ce..882bfce262eed57845e5b3bfdad401aaeffcfdb0 100644
--- a/services/ui/ws/gpu_service_proxy.h
+++ b/services/ui/ws/gpu_service_proxy.h
@@ -24,11 +24,11 @@ class GpuChannelHost;
 namespace ui {
 
 class GpuServiceInternal;
+class MusGpuMemoryBufferManager;
 
 namespace ws {
 
 class GpuServiceProxyDelegate;
-class MusGpuMemoryBufferManager;
 
 // The proxy implementation that relays requests from clients to the real
 // service implementation in the GPU process over mojom.GpuServiceInternal.
@@ -40,13 +40,14 @@ class GpuServiceProxy : public mojom::GpuService,
 
   void Add(mojom::GpuServiceRequest request);
 
+  void CreateDisplayCompositor(cc::mojom::DisplayCompositorRequest request,
+                               cc::mojom::DisplayCompositorClientPtr client);
+
  private:
   void OnInitialized(const gpu::GPUInfo& gpu_info);
   void OnGpuChannelEstablished(const EstablishGpuChannelCallback& callback,
                                int32_t client_id,
                                mojo::ScopedMessagePipeHandle channel_handle);
-  void OnInternalGpuChannelEstablished(
-      mojo::ScopedMessagePipeHandle channel_handle);
 
   // mojom::GpuService overrides:
   void EstablishGpuChannel(
@@ -67,7 +68,7 @@ class GpuServiceProxy : public mojom::GpuService,
   std::unique_ptr<base::SharedMemory> AllocateSharedMemory(
       size_t size) override;
 
-  GpuServiceProxyDelegate* delegate_;
+  GpuServiceProxyDelegate* const delegate_;
   int32_t next_client_id_;
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
   mojom::GpuServiceInternalPtr gpu_service_;
@@ -76,7 +77,6 @@ class GpuServiceProxy : public mojom::GpuService,
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_;

[sadrul, 2016/11/21 17:23:49]

Remove this? Since you are not creating it anymore, GpuServiceProxy does not
need to be a GpuChannelHostFactory either. That also means you can get rid of
|io_thread_|, |shutdown_event_|

[Fady Samuel, 2016/11/21 20:40:41]

Done.

   base::WaitableEvent shutdown_event_;
   std::unique_ptr<base::Thread> io_thread_;
-  std::unique_ptr<MusGpuMemoryBufferManager> gpu_memory_buffer_manager_;
   GpuMain gpu_main_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuServiceProxy);