mus: More gpu-related renames.

services/ui/ws/gpu_host.h

Index: services/ui/ws/gpu_host.h
diff --git a/services/ui/ws/gpu_service_proxy.h b/services/ui/ws/gpu_host.h
similarity index 72%
rename from services/ui/ws/gpu_service_proxy.h
rename to services/ui/ws/gpu_host.h
index 4a3a649712493625531a5f5aafd68f3ac22a72f8..a2511c2ecdd9b124df5d03b02089ea1723166d94 100644
--- a/services/ui/ws/gpu_service_proxy.h
+++ b/services/ui/ws/gpu_host.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_WS_GPU_SERVICE_PROXY_H_
-#define SERVICES_UI_WS_GPU_SERVICE_PROXY_H_
+#ifndef SERVICES_UI_WS_GPU_HOST_H_
+#define SERVICES_UI_WS_GPU_HOST_H_
 
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
@@ -13,8 +13,8 @@
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/ui/gpu/gpu_main.h"
-#include "services/ui/gpu/interfaces/gpu_service_host.mojom.h"
-#include "services/ui/gpu/interfaces/gpu_service_internal.mojom.h"
+#include "services/ui/gpu/interfaces/gpu_host.mojom.h"
+#include "services/ui/gpu/interfaces/gpu_service.mojom.h"
 #include "services/ui/public/interfaces/gpu.mojom.h"
 
 namespace ui {
@@ -23,14 +23,14 @@ class ServerGpuMemoryBufferManager;
 
 namespace ws {
 
-class GpuServiceProxyDelegate;
+class GpuHostDelegate;
 
 // Sets up connection from clients to the real service implementation in the GPU
 // process.
-class GpuServiceProxy : public mojom::GpuServiceHost {
+class GpuHost : public mojom::GpuHost {
  public:
-  explicit GpuServiceProxy(GpuServiceProxyDelegate* delegate);
-  ~GpuServiceProxy() override;
+  explicit GpuHost(GpuHostDelegate* delegate);
+  ~GpuHost() override;
 
   void Add(mojom::GpuRequest request);
 
@@ -39,7 +39,7 @@ class GpuServiceProxy : public mojom::GpuServiceHost {
                                cc::mojom::DisplayCompositorClientPtr client);
 
  private:
-  // mojom::GpuServiceHost:
+  // mojom::GpuHost:
   void DidInitialize(const gpu::GPUInfo& gpu_info) override;
   void DidCreateOffscreenContext(const GURL& url) override;
   void DidDestroyOffscreenContext(const GURL& url) override;
@@ -51,24 +51,24 @@ class GpuServiceProxy : public mojom::GpuServiceHost {
                          const std::string& key,
                          const std::string& shader) override;
 
-  GpuServiceProxyDelegate* const delegate_;
+  GpuHostDelegate* const delegate_;
   int32_t next_client_id_;
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
-  mojom::GpuServiceInternalPtr gpu_service_;
-  mojo::Binding<mojom::GpuServiceHost> gpu_host_binding_;
+  mojom::GpuServicePtr gpu_service_;
+  mojo::Binding<mojom::GpuHost> gpu_host_binding_;
   gpu::GPUInfo gpu_info_;
   std::unique_ptr<ServerGpuMemoryBufferManager> gpu_memory_buffer_manager_;
 
   mojom::GpuMainPtr gpu_main_;
 
-  // TODO(fsamuel): GpuServiceProxy should not be holding onto |gpu_main_impl|
+  // TODO(fsamuel): GpuHost should not be holding onto |gpu_main_impl|
   // because that will live in another process soon.
   std::unique_ptr<GpuMain> gpu_main_impl_;
 
-  DISALLOW_COPY_AND_ASSIGN(GpuServiceProxy);
+  DISALLOW_COPY_AND_ASSIGN(GpuHost);
 };
 
 }  // namespace ws
 }  // namespace ui
 
-#endif  // SERVICES_UI_WS_GPU_SERVICE_PROXY_H_
+#endif  // SERVICES_UI_WS_GPU_HOST_H_