Revert of Establish MojoChildConnection from BrowserChildProcessHostImpl

services/shell/service_manager.cc

 // Copyright 2014 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/shell/service_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 562 matching lines @@
 
   mojom::ResolverPtr resolver_ptr;
   ConnectToInterface(this, identity, CreateCatalogIdentity(), &resolver_ptr);
   mojom::Resolver* resolver = resolver_ptr.get();
   identity_to_resolver_[identity] = std::move(resolver_ptr);
   return resolver;
 }
 
 void ServiceManager::TerminateServiceManagerConnections() {
   Instance* instance = GetExistingInstance(CreateServiceManagerIdentity());
-  if (instance)
-    OnInstanceError(instance);
+  DCHECK(instance);
+  OnInstanceError(instance);
 }
 
 void ServiceManager::OnInstanceError(Instance* instance) {
   const Identity identity = instance->identity();
   // Remove the Service Manager.
   auto it = identity_to_instance_.find(identity);
   DCHECK(it != identity_to_instance_.end());
   identity_to_instance_.erase(it);
   listeners_.ForAllPtrs(
       [this, identity](mojom::ServiceManagerListener* listener) {
@@ skipping 208 matching lines @@
   // Now that the instance has a Service, we can connect to it.
   bool connected = instance->ConnectToService(&params);
   DCHECK(connected);
 }
 
 base::WeakPtr<ServiceManager> ServiceManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 }  // namespace shell