Remove Channel token from InProcessChildThreadParams

content/child/child_thread_impl.cc

 // Copyright (c) 2012 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.
 
 #include "content/child/child_thread_impl.h"
 
 #include <signal.h>
 #include <string>
 #include <utility>
 
@@ skipping 298 matching lines @@
 }
 
 ChildThreadImpl::Options::Builder::Builder() {
 }
 
 ChildThreadImpl::Options::Builder&
 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;
 }
 
 ChildThreadImpl::Options::Builder&
 ChildThreadImpl::Options::Builder::UseMojoChannel(bool use_mojo_channel) {
   options_.use_mojo_channel = use_mojo_channel;
   return *this;
 }
 
@@ skipping 66 matching lines @@
       weak_factory_(this) {
   Init(options);
 }
 
 scoped_refptr<base::SequencedTaskRunner> ChildThreadImpl::GetIOTaskRunner() {
   if (IsInBrowserProcess())
     return browser_process_io_runner_;
   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";
     std::string channel_token;
     mojo::ScopedMessagePipeHandle handle;
     if (!IsInBrowserProcess()) {
       channel_token =
           base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
               switches::kMojoChannelToken);
-    } else {
-      channel_token = ipc_token;
     }
 
     if (!channel_token.empty()) {
       // TODO(rockot): Remove all paths which lead to this branch. The Channel
       // connection should always be established by a shell connection from the
       // browser. http://crbug.com/623396.
       handle = mojo::edk::CreateChildMessagePipe(channel_token);
     } else {
       DCHECK(mojo_shell_connection_);
       IPC::mojom::ChannelBootstrapPtr bootstrap;
@@ skipping 134 matching lines @@
 
   // Add filters passed here via options.
   for (auto* startup_filter : options.startup_filters) {
     channel_->AddFilter(startup_filter);
   }
 
   IPC::AttachmentBroker* broker = IPC::AttachmentBroker::GetGlobal();
   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.
   if (options.auto_start_mojo_shell_connection && mojo_shell_connection_)
     StartMojoShellConnection();
 
   int connection_timeout = kConnectionTimeoutS;
   std::string connection_override =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kIPCConnectionTimeout);
@@ skipping 269 matching lines @@
 void ChildThreadImpl::EnsureConnected() {
   VLOG(0) << "ChildThreadImpl::EnsureConnected()";
   base::Process::Current().Terminate(0, false);
 }
 
 bool ChildThreadImpl::IsInBrowserProcess() const {
   return static_cast<bool>(browser_process_io_runner_);
 }
 
 }  // namespace content