services/ui: Split GpuServiceInternal into gpu vs. ws pieces.

services/ui/ws/mus_gpu_memory_buffer_manager.cc

Index: services/ui/ws/mus_gpu_memory_buffer_manager.cc
diff --git a/services/ui/gpu/mus_gpu_memory_buffer_manager.cc b/services/ui/ws/mus_gpu_memory_buffer_manager.cc
similarity index 78%
rename from services/ui/gpu/mus_gpu_memory_buffer_manager.cc
rename to services/ui/ws/mus_gpu_memory_buffer_manager.cc
index 409e2011f9ab219bd7f6934cb6131595958ab44d..da1e36f8d75c24906cbc4d8b1b92231909fa2ae2 100644
--- a/services/ui/gpu/mus_gpu_memory_buffer_manager.cc
+++ b/services/ui/ws/mus_gpu_memory_buffer_manager.cc
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "services/ui/gpu/mus_gpu_memory_buffer_manager.h"
+#include "services/ui/ws/mus_gpu_memory_buffer_manager.h"
 
 #include "base/logging.h"
 #include "gpu/ipc/client/gpu_memory_buffer_impl.h"
 #include "gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
-#include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 #include "services/ui/common/generic_shared_memory_id_generator.h"
 #include "services/ui/gpu/gpu_service_internal.h"
 
@@ -16,8 +15,6 @@ namespace ui {
 
 namespace {
 
-MusGpuMemoryBufferManager* g_gpu_memory_buffer_manager = nullptr;
-
 bool IsNativeGpuMemoryBufferFactoryConfigurationSupported(
     gfx::BufferFormat format,
     gfx::BufferUsage usage) {
@@ -33,23 +30,17 @@ bool IsNativeGpuMemoryBufferFactoryConfigurationSupported(
       return false;
   }
 }
-}
 
-MusGpuMemoryBufferManager* MusGpuMemoryBufferManager::current() {
-  return g_gpu_memory_buffer_manager;
-}
+}  // namespace
+
+namespace ws {
 
 MusGpuMemoryBufferManager::MusGpuMemoryBufferManager(
     GpuServiceInternal* gpu_service,
     int client_id)
-    : gpu_service_(gpu_service), client_id_(client_id), weak_factory_(this) {
-  DCHECK(!g_gpu_memory_buffer_manager);
-  g_gpu_memory_buffer_manager = this;
-}
+    : gpu_service_(gpu_service), client_id_(client_id), weak_factory_(this) {}
 
-MusGpuMemoryBufferManager::~MusGpuMemoryBufferManager() {
-  g_gpu_memory_buffer_manager = nullptr;
-}
+MusGpuMemoryBufferManager::~MusGpuMemoryBufferManager() {}
 
 std::unique_ptr<gfx::GpuMemoryBuffer>
 MusGpuMemoryBufferManager::AllocateGpuMemoryBuffer(
@@ -61,9 +52,8 @@ MusGpuMemoryBufferManager::AllocateGpuMemoryBuffer(
   const bool is_native =
       IsNativeGpuMemoryBufferFactoryConfigurationSupported(format, usage);
   if (is_native) {
-    gfx::GpuMemoryBufferHandle handle =
-        gpu_service_->gpu_memory_buffer_factory()->CreateGpuMemoryBuffer(
-            id, size, format, usage, client_id_, surface_handle);
+    gfx::GpuMemoryBufferHandle handle = gpu_service_->CreateGpuMemoryBuffer(
+        id, size, format, usage, client_id_, surface_handle);
     if (handle.is_null())
       return nullptr;
     return gpu::GpuMemoryBufferImpl::CreateFromHandle(
@@ -108,9 +98,9 @@ void MusGpuMemoryBufferManager::DestroyGpuMemoryBuffer(
     bool is_native,
     const gpu::SyncToken& sync_token) {
   if (is_native) {
-    gpu_service_->gpu_channel_manager()->DestroyGpuMemoryBuffer(id, client_id,
-                                                                sync_token);
+    gpu_service_->DestroyGpuMemoryBuffer(id, client_id, sync_token);
   }
 }
 
+}  // namespace ws
 }  // namespace ui