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

services/ui/gpu/gpu_service_internal.cc

 // 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.
 
 #include "services/ui/gpu/gpu_service_internal.h"
 
 #include "base/memory/shared_memory.h"
+#include "base/memory/singleton.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "gpu/config/gpu_switches.h"
 #include "gpu/config/gpu_util.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
 #include "gpu/ipc/common/memory_stats.h"
@@ skipping 19 matching lines @@
 namespace {
 
 void EstablishGpuChannelDone(
     mojo::ScopedMessagePipeHandle* channel_handle,
     const GpuServiceInternal::EstablishGpuChannelCallback& callback) {
   callback.Run(std::move(*channel_handle));
 }
 
 }  // namespace
 
-GpuServiceInternal::GpuServiceInternal(
-    const gpu::GPUInfo& gpu_info,
-    gpu::GpuWatchdogThread* watchdog_thread,
-    gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory)
+GpuServiceInternal::GpuServiceInternal()
     : main_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       shutdown_event_(base::WaitableEvent::ResetPolicy::MANUAL,
                       base::WaitableEvent::InitialState::NOT_SIGNALED),
       gpu_thread_("GpuThread"),
       io_thread_("GpuIOThread"),
-      watchdog_thread_(watchdog_thread),
-      gpu_memory_buffer_factory_(gpu_memory_buffer_factory),
-      gpu_info_(gpu_info),
       binding_(this) {}
 
 GpuServiceInternal::~GpuServiceInternal() {
   // Signal this event before destroying the child process.  That way all
   // background threads can cleanup.
   // For example, in the renderer the RenderThread instances will be able to
   // notice shutdown before the render process begins waiting for them to exit.
   shutdown_event_.Signal();
   io_thread_.Stop();
 }
@@ skipping 88 matching lines @@
 }
 
 void GpuServiceInternal::InitializeOnGpuThread(base::WaitableEvent* event) {
   gpu_info_.video_decode_accelerator_capabilities =
       media::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences_);
   gpu_info_.video_encode_accelerator_supported_profiles =
       media::GpuVideoEncodeAccelerator::GetSupportedProfiles(gpu_preferences_);
   gpu_info_.jpeg_decode_accelerator_supported =
       media::GpuJpegDecodeAccelerator::IsSupported();
 
+#if defined(USE_OZONE)
+  // TODO(rjkroege): Must plumb the shell::Connector* to here and pass into
+  // ozone.
+  ui::OzonePlatform::InitializeForGPU();
+#endif
+
+  if (gpu::GetNativeGpuMemoryBufferType() != gfx::EMPTY_BUFFER) {
+    gpu_memory_buffer_factory_ =
+        gpu::GpuMemoryBufferFactory::CreateNativeType();
+  }
+
+  if (!gl::init::InitializeGLOneOff())
+    VLOG(1) << "gl::init::InitializeGLOneOff failed";
+
   DCHECK(!owned_sync_point_manager_);
   const bool allow_threaded_wait = false;
   owned_sync_point_manager_.reset(
       new gpu::SyncPointManager(allow_threaded_wait));
 
   // Defer creation of the render thread. This is to prevent it from handling
   // IPC messages before the sandbox has been enabled and all other necessary
   // initialization has succeeded.
+  watchdog_thread_ = gpu::GpuWatchdogThread::Create();
   gpu_channel_manager_.reset(new gpu::GpuChannelManager(
-      gpu_preferences_, this, watchdog_thread_,
+      gpu_preferences_, this, watchdog_thread_.get(),
       base::ThreadTaskRunnerHandle::Get().get(), io_thread_.task_runner().get(),
       &shutdown_event_, owned_sync_point_manager_.get(),
-      gpu_memory_buffer_factory_));
+      gpu_memory_buffer_factory_.get()));
 
   media_service_.reset(new media::MediaService(gpu_channel_manager_.get()));
   event->Signal();
 }
 
 void GpuServiceInternal::EstablishGpuChannelOnGpuThread(
     int client_id,
     uint64_t client_tracing_id,
     bool preempts,
     bool allow_view_command_buffers,
@@ skipping 23 matching lines @@
 #endif
   CHECK(io_thread_.StartWithOptions(thread_options));
 
   base::WaitableEvent event(base::WaitableEvent::ResetPolicy::MANUAL,
                             base::WaitableEvent::InitialState::NOT_SIGNALED);
   gpu_thread_.task_runner()->PostTask(
       FROM_HERE, base::Bind(&GpuServiceInternal::InitializeOnGpuThread,
                             base::Unretained(this), &event));
   event.Wait();
 
+  // TODO(sad): Get the real GPUInfo.
   callback.Run(gpu_info_);
 }
 
 void GpuServiceInternal::EstablishGpuChannel(
     int32_t client_id,
     uint64_t client_tracing_id,
     bool is_gpu_host,
     const EstablishGpuChannelCallback& callback) {
   const bool preempts = is_gpu_host;
   const bool allow_view_command_buffers = is_gpu_host;
   const bool allow_real_time_streams = is_gpu_host;
   EstablishGpuChannelInternal(client_id, client_tracing_id, preempts,
                               allow_view_command_buffers,
                               allow_real_time_streams, callback);
 }
 
+// static
+GpuServiceInternal* GpuServiceInternal::GetInstance() {
+  return base::Singleton<GpuServiceInternal,
+                         base::LeakySingletonTraits<GpuServiceInternal>>::get();
+}
+
 }  // namespace ui