| Index: content/browser/gpu/gpu_process_host.cc
|
| diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
|
| index 3b882104d3c2e67977a11974e91b2af8ad5a1ed6..d6d52f2ff057b7e38bdeac8403d733f407e2a187 100644
|
| --- a/content/browser/gpu/gpu_process_host.cc
|
| +++ b/content/browser/gpu/gpu_process_host.cc
|
| @@ -299,9 +299,9 @@ class GpuProcessHost::ConnectionFilterImpl : public ConnectionFilter {
|
|
|
| private:
|
| // ConnectionFilter:
|
| - bool OnConnect(const shell::Identity& remote_identity,
|
| - shell::InterfaceRegistry* registry,
|
| - shell::Connector* connector) override {
|
| + bool OnConnect(const service_manager::Identity& remote_identity,
|
| + service_manager::InterfaceRegistry* registry,
|
| + service_manager::Connector* connector) override {
|
| if (remote_identity.name() != kGpuServiceName)
|
| return false;
|
|
|
| @@ -335,7 +335,7 @@ bool GpuProcessHost::ValidateHost(GpuProcessHost* host) {
|
|
|
| // static
|
| GpuProcessHost* GpuProcessHost::Get(GpuProcessKind kind, bool force_create) {
|
| - DCHECK(!shell::ShellIsRemote());
|
| + DCHECK(!service_manager::ServiceManagerIsRemote());
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
|
| // Don't grant further access to GPU if it is not allowed.
|
| @@ -415,7 +415,7 @@ void GpuProcessHost::RegisterGpuMainThreadFactory(
|
| g_gpu_main_thread_factory = create;
|
| }
|
|
|
| -shell::InterfaceProvider* GpuProcessHost::GetRemoteInterfaces() {
|
| +service_manager::InterfaceProvider* GpuProcessHost::GetRemoteInterfaces() {
|
| return process_->child_connection()->GetRemoteInterfaces();
|
| }
|
|
|
|
|