Revert of services/ui: Use new gpu::GpuInit to do the GPU initialization.

services/ui/gpu/gpu_service_internal.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_INTERNAL_H_
 #define SERVICES_UI_GPU_GPU_SERVICE_INTERNAL_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/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 "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/gpu/interfaces/gpu_service_internal.mojom.h"
 #include "ui/gfx/native_widget_types.h"
 
+namespace base {
+template <typename T>
+struct DefaultSingletonTraits;
+}
+
 namespace gpu {
 class GpuChannelHost;
 class GpuMemoryBufferFactory;
 class GpuWatchdogThread;
 class SyncPointManager;
 }
 
 namespace media {
 class MediaService;
 }
 
 namespace ui {
 
-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 GpuServiceInternal : public gpu::GpuChannelManagerDelegate,
                            public mojom::GpuServiceInternal,
                            public base::NonThreadSafe {
  public:
-  ~GpuServiceInternal() override;
+  void Add(mojom::GpuServiceInternalRequest request);
 
-  void Add(mojom::GpuServiceInternalRequest request);
+  // TODO(sad): This should not be a singleton.
+  static GpuServiceInternal* GetInstance();
 
   gpu::GpuChannelManager* gpu_channel_manager() const {
     return gpu_channel_manager_.get();
   }
 
   gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory() const {
-    return gpu_memory_buffer_factory_;
+    return gpu_memory_buffer_factory_.get();
   }
 
   // TODO(sad): These should be mojom API.
   gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
       gfx::GpuMemoryBufferId id,
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
       int client_id,
       gpu::SurfaceHandle surface_handle);
   void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
                               int client_id,
                               const gpu::SyncToken& sync_token);
 
  private:
-  friend class GpuMain;
+  friend struct base::DefaultSingletonTraits<GpuServiceInternal>;
 
-  GpuServiceInternal(const gpu::GPUInfo& gpu_info,
-                     gpu::GpuWatchdogThread* watchdog,
-                     gpu::GpuMemoryBufferFactory* memory_buffer_factory);
+  GpuServiceInternal();
+  ~GpuServiceInternal() override;
 
   void EstablishGpuChannelInternal(int32_t client_id,
                                    uint64_t client_tracing_id,
                                    bool preempts,
                                    bool allow_view_command_buffers,
                                    bool allow_real_time_streams,
                                    const EstablishGpuChannelCallback& callback);
   gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferFromeHandle(
       gfx::GpuMemoryBufferHandle buffer_handle,
       gfx::GpuMemoryBufferId id,
@@ skipping 40 matching lines @@
 
   // An event that will be signalled when we shutdown.
   base::WaitableEvent shutdown_event_;
 
   // The main thread for GpuService.
   base::Thread gpu_thread_;
 
   // The thread that handles IO events for GpuService.
   base::Thread io_thread_;
 
-  gpu::GpuWatchdogThread* watchdog_thread_;
+  scoped_refptr<gpu::GpuWatchdogThread> watchdog_thread_;
 
   std::unique_ptr<gpu::SyncPointManager> owned_sync_point_manager_;
 
   std::unique_ptr<gpu::GpuChannelManager> gpu_channel_manager_;
 
   std::unique_ptr<media::MediaService> media_service_;
 
-  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_;
 
   mojo::Binding<mojom::GpuServiceInternal> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuServiceInternal);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_GPU_GPU_SERVICE_INTERNAL_H_