gpu: Have GpuService create and own GpuMemoryBufferFactory.

services/ui/gpu/gpu_service.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_H_
 #define SERVICES_UI_GPU_GPU_SERVICE_H_
 
 #include "base/callback.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task/cancelable_task_tracker.h"
@@ skipping 30 matching lines @@
 class GpuMain;
 
 // This runs in the GPU process, and communicates with the gpu host (which is
 // the window server) over the mojom APIs. This is responsible for setting up
 // the connection to clients, allocating/free'ing gpu memory etc.
 class GpuService : public gpu::GpuChannelManagerDelegate,
                    public mojom::GpuService {
  public:
   GpuService(const gpu::GPUInfo& gpu_info,
              std::unique_ptr<gpu::GpuWatchdogThread> watchdog,
-             gpu::GpuMemoryBufferFactory* memory_buffer_factory,
              scoped_refptr<base::SingleThreadTaskRunner> io_runner,
              const gpu::GpuFeatureInfo& gpu_feature_info);
 
   ~GpuService() override;
 
   void UpdateGPUInfoFromPreferences(const gpu::GpuPreferences& preferences);
 
   void InitializeWithHost(mojom::GpuHostPtr gpu_host,
                           gpu::GpuProcessActivityFlags activity_flags,
                           gpu::SyncPointManager* sync_point_manager = nullptr,
                           base::WaitableEvent* shutdown_event = nullptr);
   void Bind(mojom::GpuServiceRequest request);
 
   media::MediaGpuChannelManager* media_gpu_channel_manager() {
     return media_gpu_channel_manager_.get();
   }
 
   gpu::GpuChannelManager* gpu_channel_manager() {
     return gpu_channel_manager_.get();
   }
 
+  gpu::ImageFactory* gpu_image_factory();
+
   gpu::GpuWatchdogThread* watchdog_thread() { return watchdog_thread_.get(); }
 
   const gpu::GpuFeatureInfo& gpu_feature_info() const {
     return gpu_feature_info_;
   }
 
   void set_in_host_process(bool in_host_process) {
     in_host_process_ = in_host_process;
   }
 
@@ skipping 69 matching lines @@
   void Crash() override;
   void Hang() override;
   void ThrowJavaException() override;
   void Stop(const StopCallback& callback) override;
 
   scoped_refptr<base::SingleThreadTaskRunner> main_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
 
   std::unique_ptr<gpu::GpuWatchdogThread> watchdog_thread_;
 
-  gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory_;
+  std::unique_ptr<gpu::GpuMemoryBufferFactory> gpu_memory_buffer_factory_;
 
   gpu::GpuPreferences gpu_preferences_;
 
   // Information about the GPU, such as device and vendor ID.
   gpu::GPUInfo gpu_info_;
 
   // Information about general chrome feature support for the GPU.
   gpu::GpuFeatureInfo gpu_feature_info_;
 
   scoped_refptr<mojom::ThreadSafeGpuHostPtr> gpu_host_;
@@ skipping 20 matching lines @@
 
   base::WeakPtr<GpuService> weak_ptr_;
   base::WeakPtrFactory<GpuService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuService);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_GPU_GPU_SERVICE_H_