Revert of service_manager: More consistent Service lifecycle API

services/service_manager/public/cpp/lib/service_context.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/service_manager/public/cpp/service_context.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 62 matching lines @@
 void ServiceContext::DestroyService() {
   QuitNow();
   service_.reset();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceContext, mojom::Service implementation:
 
 void ServiceContext::OnStart(const ServiceInfo& info,
                              const OnStartCallback& callback) {
-  service_started_ = true;
   local_info_ = info;
   callback.Run(std::move(pending_connector_request_),
                mojo::MakeRequest(&service_control_));
 
   service_->set_context(this);
   service_->OnStart();
 }
 
 void ServiceContext::OnConnect(
     const ServiceInfo& source_info,
@@ skipping 40 matching lines @@
 
   InterfaceRegistry* raw_registry = registry.get();
   registry->AddConnectionLostClosure(base::Bind(
       &ServiceContext::OnRegistryConnectionError, base::Unretained(this),
       raw_registry));
   connection_interface_registries_.insert(
       std::make_pair(raw_registry, std::move(registry)));
 }
 
 void ServiceContext::OnConnectionError() {
-  if (!service_started_) {
-    // The pipe was broken before we even received OnStart().
-    service_->set_context(this);
-    service_->OnStartFailed();
-    return;
-  }
-
   // Note that the Service doesn't technically have to quit now, it may live
   // on to service existing connections. All existing Connectors however are
   // invalid.
   service_quit_ = service_->OnStop();
   if (service_quit_) {
     QuitNow();
     // NOTE: This call may delete |this|, so don't access any ServiceContext
     // state beyond this point.
     return;
   }
@@ skipping 13 matching lines @@
 }
 
 void ServiceContext::DestroyConnectionInterfaceRegistry(
     InterfaceRegistry* registry) {
   auto it = connection_interface_registries_.find(registry);
   CHECK(it != connection_interface_registries_.end());
   connection_interface_registries_.erase(it);
 }
 
 }  // namespace service_manager