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

services/ui/ws/mus_gpu_memory_buffer_manager.h

Index: services/ui/ws/mus_gpu_memory_buffer_manager.h
diff --git a/services/ui/gpu/mus_gpu_memory_buffer_manager.h b/services/ui/ws/mus_gpu_memory_buffer_manager.h
similarity index 88%
rename from services/ui/gpu/mus_gpu_memory_buffer_manager.h
rename to services/ui/ws/mus_gpu_memory_buffer_manager.h
index 1394ddf5abbc84a7c9b51b323c3e529eddcea17c..8e65b87b50cc44a3ee2ab6d138a5e52a1eec9786 100644
--- a/services/ui/gpu/mus_gpu_memory_buffer_manager.h
+++ b/services/ui/ws/mus_gpu_memory_buffer_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_UI_GPU_MUS_GPU_MEMORY_BUFFER_MANAGER_H_
-#define SERVICES_UI_GPU_MUS_GPU_MEMORY_BUFFER_MANAGER_H_
+#ifndef SERVICES_UI_WS_MUS_GPU_MEMORY_BUFFER_MANAGER_H_
+#define SERVICES_UI_WS_MUS_GPU_MEMORY_BUFFER_MANAGER_H_
 
 #include <memory>
 
@@ -15,6 +15,8 @@ namespace ui {
 
 class GpuServiceInternal;
 
+namespace ws {
+
 // This GpuMemoryBufferManager is for establishing a GpuChannelHost used by
 // mus locally.
 class MusGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager {

[Fady Samuel, 2016/08/26 16:27:59]

Optional bikeshed color: remove the word Mus here?

[sadrul, 2016/08/26 17:23:50]

I plan to refactor+share this with the chrome code for crbug.com/637923. OK to
keep the current name until then?

@@ -22,8 +24,6 @@ class MusGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager {
   MusGpuMemoryBufferManager(GpuServiceInternal* gpu_service, int client_id);
   ~MusGpuMemoryBufferManager() override;
 
-  static MusGpuMemoryBufferManager* current();
-
   // Overridden from gpu::GpuMemoryBufferManager:
   std::unique_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
       const gfx::Size& size,
@@ -52,6 +52,7 @@ class MusGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager {
   base::WeakPtrFactory<MusGpuMemoryBufferManager> weak_factory_;
 };
 
+}  // namespace ws
 }  // namespace ui
 
-#endif  // SERVICES_UI_GPU_MUS_GPU_MEMORY_BUFFER_MANAGER_H_
+#endif  // SERVICES_UI_WS_MUS_GPU_MEMORY_BUFFER_MANAGER_H_