Replace remaining shell references with service manager

services/service_manager/public/cpp/lib/connector_impl.cc

 // Copyright 2016 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 "services/service_manager/public/cpp/lib/connector_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "services/service_manager/public/cpp/identity.h"
 #include "services/service_manager/public/cpp/lib/connection_impl.h"
 
@@ skipping 81 matching lines @@
   mojom::ConnectorRequest request = GetProxy(&connector);
   connector_->Clone(std::move(request));
   return base::MakeUnique<ConnectorImpl>(connector.PassInterface());
 }
 
 bool ConnectorImpl::BindIfNecessary() {
   // Bind this object to the current thread the first time it is used to
   // connect.
   if (!connector_.is_bound()) {
     if (!unbound_state_.is_valid()) {
-      // It's possible to get here when the link to the shell has been severed
+      // It's possible to get here when the link to the service manager has been
+      // severed
       // (and so the connector pipe has been closed) but the app has chosen not
       // to quit.
       return false;
     }
 
     // Bind the ThreadChecker to this thread.
     DCHECK(thread_checker_.CalledOnValidThread());
 
     connector_.Bind(std::move(unbound_state_));
     connector_.set_connection_error_handler(
         base::Bind(&ConnectorImpl::OnConnectionError, base::Unretained(this)));
   }
 
   return true;
 }
 
 std::unique_ptr<Connector> Connector::Create(mojom::ConnectorRequest* request) {
   mojom::ConnectorPtr proxy;
   *request = mojo::GetProxy(&proxy);
   return base::MakeUnique<ConnectorImpl>(proxy.PassInterface());
 }
 
 }  // namespace service_manager