Remove Channel token from InProcessChildThreadParams

content/child/child_thread_impl.cc

Index: content/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index 9c8670325e5e8ac30f9daa2bd7fdc4ff5066efc1..d209b7dd4722b9c103a4d07f6b37634727e50b7b 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -318,7 +318,6 @@ ChildThreadImpl::Options::Builder::InBrowserProcess(
     const InProcessChildThreadParams& params) {
   options_.browser_process_io_runner = params.io_runner();
   options_.channel_name = params.channel_name();
-  options_.in_process_ipc_token = params.ipc_token();
   options_.in_process_application_token = params.application_token();
   return *this;
 }
@@ -405,8 +404,7 @@ scoped_refptr<base::SequencedTaskRunner> ChildThreadImpl::GetIOTaskRunner() {
   return ChildProcess::current()->io_task_runner();
 }
 
-void ChildThreadImpl::ConnectChannel(bool use_mojo_channel,
-                                     const std::string& ipc_token) {
+void ChildThreadImpl::ConnectChannel(bool use_mojo_channel) {
   bool create_pipe_now = true;
   if (use_mojo_channel) {
     VLOG(1) << "Mojo is enabled on child";
@@ -416,8 +414,6 @@ void ChildThreadImpl::ConnectChannel(bool use_mojo_channel,
       channel_token =
           base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
               switches::kMojoChannelToken);
-    } else {
-      channel_token = ipc_token;
     }
 
     if (!channel_token.empty()) {
@@ -577,7 +573,7 @@ void ChildThreadImpl::Init(const Options& options) {
   if (broker && !broker->IsPrivilegedBroker())
     broker->RegisterBrokerCommunicationChannel(channel_.get());
 
-  ConnectChannel(options.use_mojo_channel, options.in_process_ipc_token);
+  ConnectChannel(options.use_mojo_channel);
 
   // This must always be done after ConnectChannel, because ConnectChannel() may
   // add a ConnectionFilter to the connection.