mus: More gpu-related renames.

services/ui/ws/window_server.h

Index: services/ui/ws/window_server.h
diff --git a/services/ui/ws/window_server.h b/services/ui/ws/window_server.h
index a965f390721644a6dd58e2f6a99fa10209c69a21..9945f0b1ec09551b8c3d1ac054b85a8ec8ecf130 100644
--- a/services/ui/ws/window_server.h
+++ b/services/ui/ws/window_server.h
@@ -20,7 +20,7 @@
 #include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/display.h"
-#include "services/ui/ws/gpu_service_proxy_delegate.h"
+#include "services/ui/ws/gpu_host_delegate.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/operation.h"
 #include "services/ui/ws/server_window_delegate.h"
@@ -35,7 +35,7 @@ namespace ws {
 
 class AccessPolicy;
 class DisplayManager;
-class GpuServiceProxy;
+class GpuHost;
 class ServerWindow;
 class UserActivityMonitor;
 class WindowManagerState;
@@ -47,7 +47,7 @@ class WindowTreeBinding;
 // WindowTrees) as well as providing the root of the hierarchy.
 class WindowServer : public ServerWindowDelegate,
                      public ServerWindowObserver,
-                     public GpuServiceProxyDelegate,
+                     public GpuHostDelegate,
                      public UserDisplayManagerDelegate,
                      public UserIdTrackerObserver,
                      public cc::mojom::DisplayCompositorClient {
@@ -65,7 +65,7 @@ class WindowServer : public ServerWindowDelegate,
     return display_manager_.get();
   }
 
-  GpuServiceProxy* gpu_proxy() { return gpu_proxy_.get(); }
+  GpuHost* gpu_host() { return gpu_host_.get(); }
 
   // Creates a new ServerWindow. The return value is owned by the caller, but
   // must be destroyed before WindowServer.
@@ -324,7 +324,7 @@ class WindowServer : public ServerWindowDelegate,
   void OnTransientWindowRemoved(ServerWindow* window,
                                 ServerWindow* transient_child) override;
 
-  // GpuServiceProxyDelegate:
+  // GpuHostDelegate:
   void OnGpuServiceInitialized() override;
 
   // cc::mojom::DisplayCompositorClient:
@@ -369,7 +369,7 @@ class WindowServer : public ServerWindowDelegate,
   // Next id supplied to the window manager.
   uint32_t next_wm_change_id_;
 
-  std::unique_ptr<GpuServiceProxy> gpu_proxy_;
+  std::unique_ptr<GpuHost> gpu_host_;
   base::Callback<void(ServerWindow*)> window_paint_callback_;
 
   UserActivityMonitorMap activity_monitor_map_;