viz: Use a simple GpuMemoryBufferManager implementation.

services/ui/gpu/gpu_main.h

Index: services/ui/gpu/gpu_main.h
diff --git a/services/ui/gpu/gpu_main.h b/services/ui/gpu/gpu_main.h
index 4b8717454370db0c65aee6bfa8e72bfbd3026165..bfc3c273ef593ee44a0101af3b252474ea56ae2b 100644
--- a/services/ui/gpu/gpu_main.h
+++ b/services/ui/gpu/gpu_main.h
@@ -15,7 +15,6 @@
 
 namespace gpu {
 class GpuMemoryBufferFactory;
-class ImageFactory;
 }
 
 namespace viz {
@@ -55,15 +54,12 @@ class GpuMain : public gpu::GpuSandboxHelper, public mojom::GpuMain {
       cc::mojom::FrameSinkManagerRequest request,
       cc::mojom::FrameSinkManagerClientPtrInfo client_info);
   void CreateFrameSinkManagerOnCompositorThread(
-      gpu::ImageFactory* image_factory,
-      mojom::GpuServicePtrInfo gpu_service_info,
       cc::mojom::FrameSinkManagerRequest request,
       cc::mojom::FrameSinkManagerClientPtrInfo client_info);
   void CreateGpuServiceOnGpuThread(mojom::GpuServiceRequest request,
                                    mojom::GpuHostPtr gpu_host,
                                    const gpu::GpuPreferences& preferences,
                                    gpu::GpuProcessActivityFlags activity_flags);
-  void BindGpuInternalOnGpuThread(mojom::GpuServiceRequest request);
 
   void TearDownOnCompositorThread();
   void TearDownOnGpuThread();
@@ -76,10 +72,6 @@ class GpuMain : public gpu::GpuSandboxHelper, public mojom::GpuMain {
   std::unique_ptr<gpu::GpuInit> gpu_init_;
   std::unique_ptr<GpuService> gpu_service_;
 
-  // The message-pipe used by the FrameSinkManager to request gpu memory
-  // buffers.
-  mojom::GpuServicePtr gpu_internal_;
-
   // The InCommandCommandBuffer::Service used by the frame sink manager.
   scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_command_service_;