Cleanup Service<> and ServiceFactory<> when clients go away.

mojo/mojo.gyp

 # Copyright 2013 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.
 
 {
   'target_defaults': {
     'conditions': [
       ['mojo_shell_debug_url != ""', {
         'defines': [
           'MOJO_SHELL_DEBUG=1',
@@ skipping 346 matching lines @@
       'sources': [
         'shell/desktop/mojo_main.cc',
       ],
     },
     {
       'target_name': 'mojo_shell_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
-        'mojo_common_lib',
-        'mojo_environment_chromium',
+        'mojo_environment_standalone',
         'mojo_run_all_unittests',
+        'mojo_utility',
         'mojo_shell_lib',
       ],
       'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
       'sources': [
         'shell/service_connector_unittest.cc',
         'shell/test.mojom',
       ],
     },
   ],
   'conditions': [
@@ skipping 71 matching lines @@
             'java_in_dir': '<(DEPTH)/mojo/shell/android/apk',
             'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res',
             'native_lib_target': 'libmojo_shell',
           },
           'includes': [ '../build/java_apk.gypi' ],
         }
       ],
     }],
   ],
 }