Revert of Add creation of ServiceManager to Content

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 @@
         'environment/default_async_waiter_impl.h',
         'environment/buffer_tls_impl.cc',
         'environment/buffer_tls_impl.h',
       ],
       'include_dirs': [
         '..',
       ],
     },
     {
       'target_name': 'mojo_service_manager',
-      'type': '<(component)',
-      'defines': [
-        'MOJO_SERVICE_MANAGER_IMPLEMENTATION',
-      ],
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
-        'mojo_environment_chromium',
         'mojo_shell_bindings',
       ],
       'sources': [
         'service_manager/service_loader.h',
         'service_manager/service_manager.cc',
         'service_manager/service_manager.h',
-        'service_manager/service_manager_export.h',
       ],
       'export_dependent_settings': [
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        'mojo_shell_bindings',
       ],
     },
     {
       'target_name': 'mojo_shell_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_static',
         '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'mojo_gles2_impl',
+        'mojo_shell_bindings',
         'mojo_service_manager',
-        'mojo_shell_bindings',
         'mojo_system',
         'mojo_system_impl',
         'mojo_native_viewport_service',
       ],
       'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
       'sources': [
         'shell/app_child_process.cc',
         'shell/app_child_process.h',
         'shell/app_child_process.mojom',
         'shell/app_child_process_host.cc',
@@ skipping 35 matching lines @@
     },
     {
       'target_name': 'mojo_shell',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../ui/gl/gl.gyp:gl',
         '../url/url.gyp:url_lib',
         'mojo_common_lib',
         'mojo_environment_chromium',
-        'mojo_service_manager',
+        'mojo_shell_bindings',
         'mojo_shell_lib',
         'mojo_system',
         'mojo_system_impl',
       ],
       'sources': [
         'shell/desktop/mojo_main.cc',
       ],
     },
     {
       'target_name': 'mojo_service_manager_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
-        '../url/url.gyp:url_lib',
         'mojo_bindings',
         'mojo_environment_standalone',
         'mojo_run_all_unittests',
         'mojo_service_manager',
-        'mojo_shell_client',
         'mojo_system',
         'mojo_utility',
       ],
       'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
       'sources': [
         'service_manager/service_manager_unittest.cc',
         'service_manager/test.mojom',
       ],
     },
     {
@@ skipping 130 matching lines @@
             'mojo_js_unittests.isolate',
           ],
           'sources': [
             'mojo_js_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }