Implement ServiceManager

mojo/mojo.gyp

Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 0a40058617edef9a50ffb71507f70639a3773ea9..47c198fb40b80637d7fc5bfcf4e2a80c3497996c 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -220,11 +220,10 @@
         '../url/url.gyp:url_lib',
         'mojo_bindings',
         'mojo_system',
+        'mojo_shell_bindings',
         'mojo_native_viewport_service',
       ],
       'sources': [
-        'shell/app_container.cc',
-        'shell/app_container.h',
         'shell/context.cc',
         'shell/context.h',
         'shell/init.cc',
@@ -237,6 +236,8 @@
         'shell/run.h',
         'shell/storage.cc',
         'shell/storage.h',
+        'shell/service_manager.cc',
+        'shell/service_manager.h',
         'shell/switches.cc',
         'shell/switches.h',
         'shell/task_runners.cc',
@@ -254,6 +255,18 @@
       ],
     },
     {
+      'target_name': 'shell_bindings',
+      'type': 'static_library',
+      'sources': [
+        'shell/shell.mojom',
+      ],
+      'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
+      'export_dependent_settings': [
+        'mojo_bindings',
+        'mojo_system',
+      ],
+    },
+    {
       'target_name': 'mojo_shell',
       'type': 'executable',
       'dependencies': [