Rename ServiceConnector back to ServiceManager

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 318 matching lines @@
         'shell/init.cc',
         'shell/init.h',
         'shell/keep_alive.cc',
         'shell/keep_alive.h',
         'shell/loader.cc',
         'shell/loader.h',
         'shell/network_delegate.cc',
         'shell/network_delegate.h',
         'shell/run.cc',
         'shell/run.h',
-        'shell/service_connector.cc',
-        'shell/service_connector.h',
+        'shell/service_manager.cc',
+        'shell/service_manager.h',
         'shell/storage.cc',
         'shell/storage.h',
         'shell/switches.cc',
         'shell/switches.h',
         'shell/task_runners.cc',
         'shell/task_runners.h',
         'shell/url_request_context_getter.cc',
         'shell/url_request_context_getter.h',
       ],
     },
@@ skipping 21 matching lines @@
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         '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/service_manager_unittest.cc',
         'shell/test.mojom',
       ],
     },
   ],
   'conditions': [
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'mojo_native_viewport_java',
           'type': 'none',
@@ skipping 66 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' ],
         }
       ],
     }],
   ],
 }