mus/gpu: Rename the client/server side memory buffer managers.

services/ui/common/server_gpu_memory_buffer_manager.h

Index: services/ui/common/server_gpu_memory_buffer_manager.h
diff --git a/services/ui/common/mus_gpu_memory_buffer_manager.h b/services/ui/common/server_gpu_memory_buffer_manager.h
similarity index 76%
rename from services/ui/common/mus_gpu_memory_buffer_manager.h
rename to services/ui/common/server_gpu_memory_buffer_manager.h
index bf46681ae4519440f59f5efce950e5de963bd30f..7448e8d19e9a44d4d16d95ff3ad2840c2e8a6495 100644
--- a/services/ui/common/mus_gpu_memory_buffer_manager.h
+++ b/services/ui/common/server_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_COMMON_MUS_GPU_MEMORY_BUFFER_MANAGER_H_
-#define SERVICES_UI_COMMON_MUS_GPU_MEMORY_BUFFER_MANAGER_H_
+#ifndef SERVICES_UI_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_
+#define SERVICES_UI_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_
 
 #include <memory>
 
@@ -18,12 +18,12 @@ namespace ui {
 
 // This GpuMemoryBufferManager is for establishing a GpuChannelHost used by
 // mus locally.
-class MusGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager,
-                                  public base::ThreadChecker {
+class ServerGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager,

[sky, 2016/12/08 20:11:04]

Does this need to be in services/ui/common? Is it only used by the
window-server?

[sadrul, 2016/12/08 20:28:34]

It is also used by the display-compositor, which lives in the gpu process.

+                                     public base::ThreadChecker {
  public:
-  MusGpuMemoryBufferManager(mojom::GpuServiceInternal* gpu_service,
-                            int client_id);
-  ~MusGpuMemoryBufferManager() override;
+  ServerGpuMemoryBufferManager(mojom::GpuServiceInternal* gpu_service,
+                               int client_id);
+  ~ServerGpuMemoryBufferManager() override;
 
   void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
                               int client_id,
@@ -63,11 +63,11 @@ class MusGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager,
   std::unordered_map<int, NativeBuffers> native_buffers_;
 
   const gpu::GpuMemoryBufferConfigurationSet native_configurations_;
-  base::WeakPtrFactory<MusGpuMemoryBufferManager> weak_factory_;
+  base::WeakPtrFactory<ServerGpuMemoryBufferManager> weak_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(MusGpuMemoryBufferManager);
+  DISALLOW_COPY_AND_ASSIGN(ServerGpuMemoryBufferManager);
 };
 
 }  // namespace ui
 
-#endif  // SERVICES_UI_COMMON_MUS_GPU_MEMORY_BUFFER_MANAGER_H_
+#endif  // SERVICES_UI_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_