mus: Rename GpuService to Gpu.

content/renderer/render_thread_impl.cc

 // Copyright (c) 2012 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 "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <utility>
@@ skipping 184 matching lines @@
 #endif
 
 #ifdef ENABLE_VTUNE_JIT_INTERFACE
 #include "v8/src/third_party/vtune/v8-vtune.h"
 #endif
 
 #if defined(USE_AURA)
 #include "content/public/common/service_manager_connection.h"
 #include "content/renderer/mus/render_widget_mus_connection.h"
 #include "content/renderer/mus/render_widget_window_tree_client_factory.h"
-#include "services/ui/public/cpp/gpu/gpu_service.h"
+#include "services/ui/public/cpp/gpu/gpu.h"
 #endif
 
 #if defined(ENABLE_IPC_FUZZER)
 #include "content/common/external_ipc_dumper.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include <malloc/malloc.h>
 #else
 #include <malloc.h>
@@ skipping 432 matching lines @@
   blink::WebView::setUseExternalPopupMenus(true);
 #endif
 
   lazy_tls.Pointer()->Set(this);
 
   // Register this object as the main thread.
   ChildProcess::current()->set_main_thread(this);
 
 #if defined(USE_AURA)
   if (IsRunningInMash()) {
-    gpu_service_ =
-        ui::GpuService::Create(GetServiceManagerConnection()->GetConnector(),
-                               ChildProcess::current()->io_task_runner());
+    gpu_ = ui::Gpu::Create(GetServiceManagerConnection()->GetConnector(),
+                           ChildProcess::current()->io_task_runner());
   }
 #endif
   gpu_memory_buffer_manager_ =
       base::MakeUnique<ChildGpuMemoryBufferManager>(thread_safe_sender());
 
   thread_safe_associated_interface_ptr_provider_ =
       base::MakeUnique<ThreadSafeAssociatedInterfacePtrProvider>(channel());
   thread_safe_render_message_filter_ =
       thread_safe_associated_interface_ptr_provider_
           ->CreateInterfacePtr<mojom::RenderMessageFilter>();
@@ skipping 982 matching lines @@
   return main_thread_compositor_task_runner_;
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 RenderThreadImpl::GetCompositorImplThreadTaskRunner() {
   return compositor_task_runner_;
 }
 
 gpu::GpuMemoryBufferManager* RenderThreadImpl::GetGpuMemoryBufferManager() {
 #if defined(USE_AURA)
-  if (gpu_service_)
-    return gpu_service_->gpu_memory_buffer_manager();
+  if (gpu_)
+    return gpu_->gpu_memory_buffer_manager();
 #endif
   return gpu_memory_buffer_manager_.get();
 }
 
 blink::scheduler::RendererScheduler* RenderThreadImpl::GetRendererScheduler() {
   return renderer_scheduler_.get();
 }
 
 std::unique_ptr<cc::BeginFrameSource>
 RenderThreadImpl::CreateExternalBeginFrameSource(int routing_id) {
@@ skipping 275 matching lines @@
     // Cache some variables that are needed on the compositor thread for our
     // implementation of GpuChannelHostFactory.
     io_thread_task_runner_ = ChildProcess::current()->io_task_runner();
 
     gpu_channel_ =
         gpu::GpuChannelHost::Create(this, client_id, gpu_info, channel_handle,
                                     ChildProcess::current()->GetShutDownEvent(),
                                     GetGpuMemoryBufferManager());
   } else {
 #if defined(USE_AURA)
-    gpu_channel_ = gpu_service_->EstablishGpuChannelSync();
+    gpu_channel_ = gpu_->EstablishGpuChannelSync();
 #else
     NOTREACHED();
 #endif
   }
   return gpu_channel_;
 }
 
 std::unique_ptr<cc::CompositorFrameSink>
 RenderThreadImpl::CreateCompositorFrameSink(
     bool use_software,
@@ skipping 547 matching lines @@
   }
 }
 
 void RenderThreadImpl::OnRendererInterfaceRequest(
     mojom::RendererAssociatedRequest request) {
   DCHECK(!renderer_binding_.is_bound());
   renderer_binding_.Bind(std::move(request));
 }
 
 }  // namespace content