viz: Use a simple GpuMemoryBufferManager implementation.

services/ui/gpu/gpu_main.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_MAIN_H_
 #define SERVICES_UI_GPU_GPU_MAIN_H_
 
 #include "base/power_monitor/power_monitor.h"
 #include "base/threading/thread.h"
 #include "gpu/ipc/in_process_command_buffer.h"
 #include "gpu/ipc/service/gpu_init.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/gpu/interfaces/gpu_main.mojom.h"
 #include "services/ui/gpu/interfaces/gpu_service.mojom.h"
 
 namespace gpu {
 class GpuMemoryBufferFactory;
-class ImageFactory;
 }
 
 namespace viz {
 class DisplayProvider;
 class MojoFrameSinkManager;
 }
 
 namespace ui {
 
 class GpuService;
@@ skipping 19 matching lines @@
  private:
   void BindOnGpu(mojom::GpuMainRequest request);
   void InitOnGpuThread(
       scoped_refptr<base::SingleThreadTaskRunner> io_runner,
       scoped_refptr<base::SingleThreadTaskRunner> compositor_runner);
 
   void CreateFrameSinkManagerInternal(
       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();
 
   // gpu::GpuSandboxHelper:
   void PreSandboxStartup() override;
   bool EnsureSandboxInitialized(
       gpu::GpuWatchdogThread* watchdog_thread) override;
 
   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_;
 
   // If the gpu service is not yet ready then we stash pending MessagePipes in
   // these member variables.
   cc::mojom::FrameSinkManagerRequest pending_frame_sink_manager_request_;
   cc::mojom::FrameSinkManagerClientPtrInfo
       pending_frame_sink_manager_client_info_;
 
   // Provides mojo interfaces for creating and managing FrameSinks.
@@ skipping 19 matching lines @@
 
   base::PowerMonitor power_monitor_;
   mojo::Binding<mojom::GpuMain> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuMain);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_GPU_GPU_MAIN_H_