mus: More gpu-related renames.

services/ui/gpu/gpu_main.h

Index: services/ui/gpu/gpu_main.h
diff --git a/services/ui/gpu/gpu_main.h b/services/ui/gpu/gpu_main.h
index 694b717f74050a2e178ec119d84f9aee5c71a949..031b5b9d50fc030af80aa3ad5e239051a03105ba 100644
--- a/services/ui/gpu/gpu_main.h
+++ b/services/ui/gpu/gpu_main.h
@@ -9,7 +9,7 @@
 #include "gpu/ipc/in_process_command_buffer.h"
 #include "gpu/ipc/service/gpu_init.h"
 #include "services/ui/gpu/interfaces/gpu_main.mojom.h"
-#include "services/ui/gpu/interfaces/gpu_service_internal.mojom.h"
+#include "services/ui/gpu/interfaces/gpu_service.mojom.h"
 #include "services/ui/surfaces/display_compositor.h"
 
 namespace gpu {
@@ -19,7 +19,7 @@ class ImageFactory;
 
 namespace ui {
 
-class GpuServiceInternal;
+class GpuService;
 
 class GpuMain : public gpu::GpuSandboxHelper, public mojom::GpuMain {
  public:
@@ -27,15 +27,15 @@ class GpuMain : public gpu::GpuSandboxHelper, public mojom::GpuMain {
   ~GpuMain() override;
 
   // mojom::GpuMain implementation:
-  void CreateGpuService(mojom::GpuServiceInternalRequest request,
-                        mojom::GpuServiceHostPtr gpu_host) override;
+  void CreateGpuService(mojom::GpuServiceRequest request,
+                        mojom::GpuHostPtr gpu_host) override;
   void CreateDisplayCompositor(
       cc::mojom::DisplayCompositorRequest request,
       cc::mojom::DisplayCompositorClientPtr client) override;
 
   void OnStart();
 
-  GpuServiceInternal* gpu_service() { return gpu_service_internal_.get(); }
+  GpuService* gpu_service() { return gpu_service_.get(); }
 
  private:
   void InitOnGpuThread(
@@ -47,12 +47,12 @@ class GpuMain : public gpu::GpuSandboxHelper, public mojom::GpuMain {
       cc::mojom::DisplayCompositorClientPtrInfo client_info);
   void CreateDisplayCompositorOnCompositorThread(
       gpu::ImageFactory* image_factory,
-      mojom::GpuServiceInternalPtrInfo gpu_service_info,
+      mojom::GpuServicePtrInfo gpu_service_info,
       cc::mojom::DisplayCompositorRequest request,
       cc::mojom::DisplayCompositorClientPtrInfo client_info);
-  void CreateGpuServiceOnGpuThread(mojom::GpuServiceInternalRequest request,
-                                   mojom::GpuServiceHostPtrInfo gpu_host_info);
-  void BindGpuInternalOnGpuThread(mojom::GpuServiceInternalRequest request);
+  void CreateGpuServiceOnGpuThread(mojom::GpuServiceRequest request,
+                                   mojom::GpuHostPtrInfo gpu_host_info);
+  void BindGpuInternalOnGpuThread(mojom::GpuServiceRequest request);
 
   void TearDownOnCompositorThread();
   void TearDownOnGpuThread();
@@ -63,11 +63,11 @@ class GpuMain : public gpu::GpuSandboxHelper, public mojom::GpuMain {
       gpu::GpuWatchdogThread* watchdog_thread) override;
 
   std::unique_ptr<gpu::GpuInit> gpu_init_;
-  std::unique_ptr<GpuServiceInternal> gpu_service_internal_;
+  std::unique_ptr<GpuService> gpu_service_;
 
   // The message-pipe used by the DisplayCompositor to request gpu memory
   // buffers.
-  mojom::GpuServiceInternalPtr gpu_internal_;
+  mojom::GpuServicePtr gpu_internal_;
 
   // The InCommandCommandBuffer::Service used by the display compositor.
   scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_command_service_;