ShellClient -> Service

content/browser/renderer_host/render_process_host_impl.cc

Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 1c2f0563339e1c2e50a061de70bbf36b4b93ecab..c1c834adc180bf680335d0d4621099e5e6f59fec 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -611,8 +611,7 @@ RenderProcessHostImpl::RenderProcessHostImpl(
     // MojoShellConnection prior to this point. This class of test code doesn't
     // care about render processes so we can initialize a dummy one.
     if (!MojoShellConnection::GetForProcess()) {
-      shell::mojom::ShellClientRequest request =
-          mojo::GetProxy(&test_shell_client_);
+      shell::mojom::ServiceRequest request = mojo::GetProxy(&test_service_);
       MojoShellConnection::SetForProcess(MojoShellConnection::Create(
           std::move(request)));
     }
@@ -750,7 +749,7 @@ bool RenderProcessHostImpl::Init() {
             BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO)
                 ->task_runner(),
             mojo_channel_token_,
-            mojo_child_connection_->shell_client_token())));
+            mojo_child_connection_->service_token())));
 
     base::Thread::Options options;
 #if defined(OS_WIN) && !defined(OS_MACOSX)
@@ -1345,7 +1344,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
                                     mojo_channel_token_);
   }
   command_line->AppendSwitchASCII(switches::kMojoApplicationChannelToken,
-                                  mojo_child_connection_->shell_client_token());
+                                  mojo_child_connection_->service_token());
 }
 
 void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
@@ -1603,7 +1602,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
 
   DCHECK(mojo_child_connection_);
   renderer_cmd->AppendSwitchASCII(switches::kPrimordialPipeToken,
-                                  mojo_child_connection_->shell_client_token());
+                                  mojo_child_connection_->service_token());
 
 #if defined(OS_WIN) && !defined(OFFICIAL_BUILD)
   // Needed because we can't show the dialog from the sandbox. Don't pass