Change the NaCl loader and broker processes to use the ServiceManager.

components/nacl/loader/nacl_helper_linux.cc

 // Copyright 2013 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.
 
 // A mini-zygote specifically for Native Client.
 
 #include "components/nacl/loader/nacl_helper_linux.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ skipping 134 matching lines @@
                          const std::string& channel_id) {
   DCHECK(child_fds.size() >
          std::max(content::ZygoteForkDelegate::kPIDOracleFDIndex,
                   content::ZygoteForkDelegate::kBrowserFDIndex));
 
   // Ping the PID oracle socket.
   CHECK(content::SendZygoteChildPing(
       child_fds[content::ZygoteForkDelegate::kPIDOracleFDIndex].get()));
 
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kMojoChannelToken, channel_id);
+      switches::kServiceRequestChannelToken, channel_id);
 
   // Save the browser socket and close the rest.
   base::ScopedFD browser_fd(
       std::move(child_fds[content::ZygoteForkDelegate::kBrowserFDIndex]));
   child_fds.clear();
 
   BecomeNaClLoader(std::move(browser_fd), system_info, uses_nonsfi_mode,
                    nacl_sandbox);
   _exit(1);
 }
@@ skipping 301 matching lines @@
   // Now handle requests from the Zygote.
   while (true) {
     bool request_handled = HandleZygoteRequest(
         kNaClZygoteDescriptor, system_info, nacl_sandbox.get());
     // Do not turn this into a CHECK() without thinking about robustness
     // against malicious IPC requests.
     DCHECK(request_handled);
   }
   NOTREACHED();
 }