Revert of Add creation of ServiceManager to Content

mojo/mojo.gyp

Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index a47b1ec80c6677f1f5555a6d334fd394400ff032..6805d2868e24711d621c90a9333ed5f7847b9ba9 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -336,27 +336,21 @@
     },
     {
       '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',
       ],
     },
     {
@@ -368,8 +362,8 @@
         '../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',
@@ -425,7 +419,7 @@
         '../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',
@@ -440,12 +434,10 @@
       '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',
       ],