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

services/ui/ws/mus_gpu_memory_buffer_manager.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_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>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 
 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?

  public:
   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,
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
       gpu::SurfaceHandle surface_handle) override;
   std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBufferFromHandle(
       const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,
       gfx::BufferFormat format) override;
   gfx::GpuMemoryBuffer* GpuMemoryBufferFromClientBuffer(
       ClientBuffer buffer) override;
   void SetDestructionSyncToken(gfx::GpuMemoryBuffer* buffer,
                                const gpu::SyncToken& sync_token) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MusGpuMemoryBufferManager);
 
   void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
                               int client_id,
                               bool is_native,
                               const gpu::SyncToken& sync_token);
 
   GpuServiceInternal* gpu_service_;
   const int client_id_;
   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_