Move mojo\shell to services\shell

mojo/mojo_shell.gyp

Index: mojo/mojo_shell.gyp
diff --git a/mojo/mojo_shell.gyp b/mojo/mojo_shell.gyp
index 1decb57f82020514c622c57605476997ef69c545..f7e8949a19c226b86a746e0357cd0f14ca7a2e1b 100644
--- a/mojo/mojo_shell.gyp
+++ b/mojo/mojo_shell.gyp
@@ -16,17 +16,17 @@
       'services/catalog/store.cc',
       'services/catalog/store.h',
       'services/catalog/types.h',
-      'shell/loader.h',
-      'shell/connect_params.cc',
-      'shell/connect_params.h',
-      'shell/connect_util.cc',
-      'shell/connect_util.h',
-      'shell/native_runner.h',
-      'shell/native_runner_delegate.h',
-      'shell/shell.cc',
-      'shell/shell.h',
-      'shell/switches.cc',
-      'shell/switches.cc',
+      '../services/shell/loader.h',
+      '../services/shell/connect_params.cc',
+      '../services/shell/connect_params.h',
+      '../services/shell/connect_util.cc',
+      '../services/shell/connect_util.h',
+      '../services/shell/native_runner.h',
+      '../services/shell/native_runner_delegate.h',
+      '../services/shell/shell.cc',
+      '../services/shell/shell.h',
+      '../services/shell/switches.cc',
+      '../services/shell/switches.cc',
       'util/filename_util.cc',
       'util/filename_util.h',
     ],
@@ -47,7 +47,7 @@
     'target_name': 'mojo_shell_unittests',
     'type': 'executable',
     'sources': [
-      'shell/tests/loader_unittest.cc',
+      '../services/shell/tests/loader_unittest.cc',
     ],
     'dependencies': [
       'mojo_shell_lib',
@@ -66,7 +66,7 @@
     'type': 'static_library',
     'variables': {
       'mojom_files': [
-        'shell/tests/test.mojom',
+        '../services/shell/tests/test.mojom',
       ],
     },
     'includes': [
@@ -76,10 +76,10 @@
     'target_name': 'mojo_runner_common_lib',
     'type': 'static_library',
     'sources': [
-      'shell/runner/common/client_util.cc',
-      'shell/runner/common/client_util.h',
-      'shell/runner/common/switches.cc',
-      'shell/runner/common/switches.h',
+      '../services/shell/runner/common/client_util.cc',
+      '../services/shell/runner/common/client_util.h',
+      '../services/shell/runner/common/switches.cc',
+      '../services/shell/runner/common/switches.h',
     ],
     'include_dirs': [
       '..',
@@ -98,20 +98,20 @@
     'target_name': 'mojo_runner_host_lib',
     'type': 'static_library',
     'sources': [
-      'shell/runner/host/child_process.cc',
-      'shell/runner/host/child_process.h',
-      'shell/runner/host/child_process_base.cc',
-      'shell/runner/host/child_process_base.h',
-      'shell/runner/host/child_process_host.cc',
-      'shell/runner/host/child_process_host.h',
-      'shell/runner/host/in_process_native_runner.cc',
-      'shell/runner/host/in_process_native_runner.h',
-      'shell/runner/host/out_of_process_native_runner.cc',
-      'shell/runner/host/out_of_process_native_runner.h',
-      'shell/runner/host/native_application_support.cc',
-      'shell/runner/host/native_application_support.h',
-      'shell/runner/init.cc',
-      'shell/runner/init.h',
+      '../services/shell/runner/host/child_process.cc',
+      '../services/shell/runner/host/child_process.h',
+      '../services/shell/runner/host/child_process_base.cc',
+      '../services/shell/runner/host/child_process_base.h',
+      '../services/shell/runner/host/child_process_host.cc',
+      '../services/shell/runner/host/child_process_host.h',
+      '../services/shell/runner/host/in_process_native_runner.cc',
+      '../services/shell/runner/host/in_process_native_runner.h',
+      '../services/shell/runner/host/out_of_process_native_runner.cc',
+      '../services/shell/runner/host/out_of_process_native_runner.h',
+      '../services/shell/runner/host/native_application_support.cc',
+      '../services/shell/runner/host/native_application_support.h',
+      '../services/shell/runner/init.cc',
+      '../services/shell/runner/init.h',
     ],
     'dependencies': [
       'mojo_runner_common_lib',
@@ -130,8 +130,8 @@
     'conditions': [
       ['OS=="linux"', {
         'sources': [
-          'shell/runner/host/linux_sandbox.cc',
-          'shell/runner/host/linux_sandbox.h',
+          '../services/shell/runner/host/linux_sandbox.cc',
+          '../services/shell/runner/host/linux_sandbox.h',
         ],
         'dependencies': [
           '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
@@ -142,8 +142,8 @@
       }],
       ['OS=="mac"', {
         'sources': [
-          'shell/runner/host/mach_broker.cc',
-          'shell/runner/host/mach_broker.h',
+          '../services/shell/runner/host/mach_broker.cc',
+          '../services/shell/runner/host/mach_broker.h',
         ],
       }],
     ],