| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 625c629d00eac693b94dd020b6600e30bf7dc2e6..2095076b4bac38602c5e23f7d3c1165c95e32763 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -202,7 +202,7 @@
|
| #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)
|
| @@ -655,9 +655,8 @@ void RenderThreadImpl::Init(
|
|
|
| #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_ =
|
| @@ -1660,8 +1659,8 @@ RenderThreadImpl::GetCompositorImplThreadTaskRunner() {
|
|
|
| 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();
|
| }
|
| @@ -1957,7 +1956,7 @@ scoped_refptr<gpu::GpuChannelHost> RenderThreadImpl::EstablishGpuChannelSync() {
|
| GetGpuMemoryBufferManager());
|
| } else {
|
| #if defined(USE_AURA)
|
| - gpu_channel_ = gpu_service_->EstablishGpuChannelSync();
|
| + gpu_channel_ = gpu_->EstablishGpuChannelSync();
|
| #else
|
| NOTREACHED();
|
| #endif
|
|
|