mus: More gpu-related renames.

services/ui/gpu/gpu_main.cc

 // 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.
 
 #include "services/ui/gpu/gpu_main.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
 #include "gpu/ipc/gpu_in_process_thread_service.h"
 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 #include "gpu/ipc/service/gpu_watchdog_thread.h"
 #include "services/ui/common/server_gpu_memory_buffer_manager.h"
-#include "services/ui/gpu/gpu_service_internal.h"
+#include "services/ui/gpu/gpu_service.h"
 
 namespace {
 
 #if defined(OS_WIN)
 std::unique_ptr<base::MessagePump> CreateMessagePumpWin() {
   base::MessagePumpForGpu::InitFactory();
   return base::MessageLoop::CreateMessagePumpForType(
       base::MessageLoop::TYPE_UI);
 }
 #endif  // defined(OS_WIN)
@@ skipping 78 matching lines @@
 
 void GpuMain::OnStart() {
   // |this| will outlive the gpu thread and so it's safe to use
   // base::Unretained here.
   gpu_thread_.task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&GpuMain::InitOnGpuThread, base::Unretained(this),
                  io_thread_.task_runner(), compositor_thread_.task_runner()));
 }
 
-void GpuMain::CreateGpuService(mojom::GpuServiceInternalRequest request,
-                               mojom::GpuServiceHostPtr gpu_host) {
+void GpuMain::CreateGpuService(mojom::GpuServiceRequest request,
+                               mojom::GpuHostPtr gpu_host) {
   // |this| will outlive the gpu thread and so it's safe to use
   // base::Unretained here.
   gpu_thread_.task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&GpuMain::CreateGpuServiceOnGpuThread, base::Unretained(this),
                  base::Passed(std::move(request)),
                  base::Passed(gpu_host.PassInterface())));
 }
 
 void GpuMain::CreateDisplayCompositor(
     cc::mojom::DisplayCompositorRequest request,
     cc::mojom::DisplayCompositorClientPtr client) {
-  if (!gpu_service_internal_) {
+  if (!gpu_service_) {
     pending_display_compositor_request_ = std::move(request);
     pending_display_compositor_client_info_ = client.PassInterface();
     return;
   }
   CreateDisplayCompositorInternal(std::move(request), client.PassInterface());
 }
 
 void GpuMain::InitOnGpuThread(
     scoped_refptr<base::SingleThreadTaskRunner> io_runner,
     scoped_refptr<base::SingleThreadTaskRunner> compositor_runner) {
   gpu_init_.reset(new gpu::GpuInit());
   gpu_init_->set_sandbox_helper(this);
   bool success = gpu_init_->InitializeAndStartSandbox(
       *base::CommandLine::ForCurrentProcess());
   if (!success)
     return;
 
   if (gpu::GetNativeGpuMemoryBufferType() != gfx::EMPTY_BUFFER) {
     gpu_memory_buffer_factory_ =
         gpu::GpuMemoryBufferFactory::CreateNativeType();
   }
 
-  gpu_service_internal_ = base::MakeUnique<GpuServiceInternal>(
+  gpu_service_ = base::MakeUnique<GpuService>(
       gpu_init_->gpu_info(), gpu_init_->TakeWatchdogThread(),
       gpu_memory_buffer_factory_.get(), io_runner);
 }
 
 void GpuMain::CreateDisplayCompositorInternal(
     cc::mojom::DisplayCompositorRequest request,
     cc::mojom::DisplayCompositorClientPtrInfo client_info) {
   DCHECK(!gpu_command_service_);
   gpu_command_service_ = new gpu::GpuInProcessThreadService(
-      gpu_thread_.task_runner(), gpu_service_internal_->sync_point_manager(),
-      gpu_service_internal_->mailbox_manager(),
-      gpu_service_internal_->share_group());
+      gpu_thread_.task_runner(), gpu_service_->sync_point_manager(),
+      gpu_service_->mailbox_manager(), gpu_service_->share_group());
 
   // |gpu_memory_buffer_factory_| is null in tests.
   gpu::ImageFactory* image_factory =
       gpu_memory_buffer_factory_ ? gpu_memory_buffer_factory_->AsImageFactory()
                                  : nullptr;
 
-  mojom::GpuServiceInternalPtr gpu_service;
-  mojom::GpuServiceInternalRequest gpu_service_request =
-      mojo::GetProxy(&gpu_service);
+  mojom::GpuServicePtr gpu_service;
+  mojom::GpuServiceRequest gpu_service_request = mojo::GetProxy(&gpu_service);
 
   if (gpu_thread_.task_runner()->BelongsToCurrentThread()) {
-    // If the DisplayCompositor creation was delayed because GpuServiceInternal
+    // If the DisplayCompositor creation was delayed because GpuService
     // had not been created yet, then this is called, in gpu thread, right after
-    // GpuServiceInternal is created.
+    // GpuService is created.
     BindGpuInternalOnGpuThread(std::move(gpu_service_request));
   } else {
     gpu_thread_.task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&GpuMain::BindGpuInternalOnGpuThread, base::Unretained(this),
                    base::Passed(std::move(gpu_service_request))));
   }
 
   compositor_thread_.task_runner()->PostTask(
       FROM_HERE, base::Bind(&GpuMain::CreateDisplayCompositorOnCompositorThread,
                             base::Unretained(this), image_factory,
                             base::Passed(gpu_service.PassInterface()),
                             base::Passed(std::move(request)),
                             base::Passed(std::move(client_info))));
 }
 
 void GpuMain::CreateDisplayCompositorOnCompositorThread(
     gpu::ImageFactory* image_factory,
-    mojom::GpuServiceInternalPtrInfo gpu_service_info,
+    mojom::GpuServicePtrInfo gpu_service_info,
     cc::mojom::DisplayCompositorRequest request,
     cc::mojom::DisplayCompositorClientPtrInfo client_info) {
   DCHECK(!display_compositor_);
   cc::mojom::DisplayCompositorClientPtr client;
   client.Bind(std::move(client_info));
 
   gpu_internal_.Bind(std::move(gpu_service_info));
 
   display_compositor_ = base::MakeUnique<DisplayCompositor>(
       gpu_command_service_, base::MakeUnique<ServerGpuMemoryBufferManager>(
                                 gpu_internal_.get(), 1 /* client_id */),
       image_factory, std::move(request), std::move(client));
 }
 
 void GpuMain::TearDownOnCompositorThread() {
   display_compositor_.reset();
   gpu_internal_.reset();
 }
 
 void GpuMain::TearDownOnGpuThread() {
-  gpu_service_internal_.reset();
+  gpu_service_.reset();
   gpu_memory_buffer_factory_.reset();
   gpu_init_.reset();
 }
 
 void GpuMain::CreateGpuServiceOnGpuThread(
-    mojom::GpuServiceInternalRequest request,
-    mojom::GpuServiceHostPtrInfo gpu_host_info) {
-  mojom::GpuServiceHostPtr gpu_host;
+    mojom::GpuServiceRequest request,
+    mojom::GpuHostPtrInfo gpu_host_info) {
+  mojom::GpuHostPtr gpu_host;
   gpu_host.Bind(std::move(gpu_host_info));
-  gpu_service_internal_->InitializeWithHost(std::move(gpu_host));
-  gpu_service_internal_->Bind(std::move(request));
+  gpu_service_->InitializeWithHost(std::move(gpu_host));
+  gpu_service_->Bind(std::move(request));
 
   if (pending_display_compositor_request_.is_pending()) {
     CreateDisplayCompositorInternal(
         std::move(pending_display_compositor_request_),
         std::move(pending_display_compositor_client_info_));
   }
 }
 
-void GpuMain::BindGpuInternalOnGpuThread(
-    mojom::GpuServiceInternalRequest request) {
-  gpu_service_internal_->Bind(std::move(request));
+void GpuMain::BindGpuInternalOnGpuThread(mojom::GpuServiceRequest request) {
+  gpu_service_->Bind(std::move(request));
 }
 
 void GpuMain::PreSandboxStartup() {
   // TODO(sad): https://crbug.com/645602
 }
 
 bool GpuMain::EnsureSandboxInitialized(
     gpu::GpuWatchdogThread* watchdog_thread) {
   // TODO(sad): https://crbug.com/645602
   return true;
 }
 
 }  // namespace ui