| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index c3600c7fb3db63d727a1ce7ac253f149d1485031..760f5994e624696a3513032334caf7c20177a966 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -1211,7 +1211,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
|
| InitializeMojo();
|
|
|
| #if defined(USE_AURA)
|
| - if (shell::ShellIsRemote()) {
|
| + if (service_manager::ServiceManagerIsRemote()) {
|
| base::CommandLine::ForCurrentProcess()->AppendSwitch(
|
| switches::kIsRunningInMash);
|
| }
|
| @@ -1248,7 +1248,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
|
| established_gpu_channel = true;
|
| if (!GpuDataManagerImpl::GetInstance()->CanUseGpuBrowserCompositor() ||
|
| parsed_command_line_.HasSwitch(switches::kDisableGpuEarlyInit) ||
|
| - shell::ShellIsRemote()) {
|
| + service_manager::ServiceManagerIsRemote()) {
|
| established_gpu_channel = always_uses_gpu = false;
|
| }
|
| gpu::GpuChannelEstablishFactory* factory =
|
| @@ -1369,7 +1369,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
|
| // ChildProcess instance which is created by the renderer thread.
|
| if (GpuDataManagerImpl::GetInstance()->GpuAccessAllowed(NULL) &&
|
| !established_gpu_channel && always_uses_gpu && !UsingInProcessGpu() &&
|
| - !shell::ShellIsRemote()) {
|
| + !service_manager::ServiceManagerIsRemote()) {
|
| TRACE_EVENT_INSTANT0("gpu", "Post task to launch GPU process",
|
| TRACE_EVENT_SCOPE_THREAD);
|
| BrowserThread::PostTask(
|
|
|