service_manager: More consistent Service lifecycle API

services/service_manager/tests/connect/connect_test_package.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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
@@ skipping 163 matching lines @@
     service_factory_bindings_.set_connection_error_handler(error_handler);
   }
 
   bool OnConnect(const ServiceInfo& remote_info,
                  InterfaceRegistry* registry) override {
     registry->AddInterface<ServiceFactory>(this);
     registry->AddInterface<test::mojom::ConnectTestService>(this);
     return true;
   }
 
-  bool OnStop() override {
+  bool OnServiceManagerConnectionLost() override {
     provided_services_.clear();
     return true;
   }
 
   // InterfaceFactory<mojom::ServiceFactory>:
   void Create(const Identity& remote_identity,
               mojom::ServiceFactoryRequest request) override {
     service_factory_bindings_.AddBinding(this, std::move(request));
   }
 
@@ skipping 37 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ConnectTestService);
 };
 
 }  // namespace service_manager
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   service_manager::ServiceRunner runner(
       new service_manager::ConnectTestService);
   return runner.Run(service_request_handle);
 }