Replace remaining shell references with service manager

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 377 matching lines @@
 void ChildThreadImpl::ConnectChannel() {
   std::string channel_token;
   mojo::ScopedMessagePipeHandle handle;
   if (!IsInBrowserProcess()) {
     channel_token = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kMojoChannelToken);
   }
 
   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.
+    // connection should always be established by a service manager connection
+    // from the browser. http://crbug.com/623396.
     handle = mojo::edk::CreateChildMessagePipe(channel_token);
   } else {
     DCHECK(service_manager_connection_);
     IPC::mojom::ChannelBootstrapPtr bootstrap;
     handle = mojo::GetProxy(&bootstrap).PassMessagePipe();
     service_manager_connection_->AddConnectionFilter(
         base::MakeUnique<ChannelBootstrapFilter>(bootstrap.PassInterface()));
   }
 
   DCHECK(handle.is_valid());
@@ skipping 454 matching lines @@
   Listener* route = router_.GetRoute(routing_id);
   if (route)
     route->OnAssociatedInterfaceRequest(name, request.PassHandle());
 }
 
 bool ChildThreadImpl::IsInBrowserProcess() const {
   return static_cast<bool>(browser_process_io_runner_);
 }
 
 }  // namespace content