Move mojo\shell to services\shell

mojo/mojo_base.gyp

Index: mojo/mojo_base.gyp
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
index b13343b63cf0574b4456516b0398677dc1465e4c..7eec79add4da2f9464179e002c3d966f1f08fe9a 100644
--- a/mojo/mojo_base.gyp
+++ b/mojo/mojo_base.gyp
@@ -126,52 +126,52 @@
         'mojom_files': [
           'services/catalog/public/interfaces/catalog.mojom',
           'services/catalog/public/interfaces/resolver.mojom',
-          'shell/public/interfaces/capabilities.mojom',
-          'shell/public/interfaces/connector.mojom',
-          'shell/public/interfaces/interface_provider.mojom',
-          'shell/public/interfaces/shell.mojom',
-          'shell/public/interfaces/shell_client.mojom',
-          'shell/public/interfaces/shell_client_factory.mojom',
-          'shell/public/interfaces/shell_resolver.mojom',
+          '../services/shell/public/interfaces/capabilities.mojom',
+          '../services/shell/public/interfaces/connector.mojom',
+          '../services/shell/public/interfaces/interface_provider.mojom',
+          '../services/shell/public/interfaces/shell.mojom',
+          '../services/shell/public/interfaces/shell_client.mojom',
+          '../services/shell/public/interfaces/shell_client_factory.mojom',
+          '../services/shell/public/interfaces/shell_resolver.mojom',
         ],
       },
       'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
     },
     {
-      # GN version: //mojo/shell/public/cpp
+      # GN version: //services/shell/public/cpp
       'target_name': 'mojo_application_base',
       'type': 'static_library',
       'sources': [
-        'shell/public/cpp/application_runner.h',
-        'shell/public/cpp/capabilities.h',
-        'shell/public/cpp/connect.h',
-        'shell/public/cpp/connection.h',
-        'shell/public/cpp/connector.h',
-        'shell/public/cpp/identity.h',
-        'shell/public/cpp/initialize_base_and_icu.cc',
-        'shell/public/cpp/initialize_base_and_icu.h',
-        'shell/public/cpp/interface_binder.h',
-        'shell/public/cpp/interface_factory.h',
-        'shell/public/cpp/interface_factory_impl.h',
-        'shell/public/cpp/interface_registry.h',
-        'shell/public/cpp/lib/application_runner.cc',
-        'shell/public/cpp/lib/capabilities.cc',
-        'shell/public/cpp/lib/connection_impl.cc',
-        'shell/public/cpp/lib/connection_impl.h',
-        'shell/public/cpp/lib/connector_impl.cc',
-        'shell/public/cpp/lib/connector_impl.h',
-        'shell/public/cpp/lib/identity.cc',
-        'shell/public/cpp/lib/interface_factory_binder.h',
-        'shell/public/cpp/lib/interface_registry.cc',
-        'shell/public/cpp/lib/message_loop_ref.cc',
-        'shell/public/cpp/lib/names.cc',
-        'shell/public/cpp/lib/shell_client.cc',
-        'shell/public/cpp/lib/shell_connection.cc',
-        'shell/public/cpp/message_loop_ref.h',
-        'shell/public/cpp/names.h',
-        'shell/public/cpp/shell.h',
-        'shell/public/cpp/shell_client.h',
-        'shell/public/cpp/shell_connection.h',
+        '../services/shell/public/cpp/application_runner.h',
+        '../services/shell/public/cpp/capabilities.h',
+        '../services/shell/public/cpp/connect.h',
+        '../services/shell/public/cpp/connection.h',
+        '../services/shell/public/cpp/connector.h',
+        '../services/shell/public/cpp/identity.h',
+        '../services/shell/public/cpp/initialize_base_and_icu.cc',
+        '../services/shell/public/cpp/initialize_base_and_icu.h',
+        '../services/shell/public/cpp/interface_binder.h',
+        '../services/shell/public/cpp/interface_factory.h',
+        '../services/shell/public/cpp/interface_factory_impl.h',
+        '../services/shell/public/cpp/interface_registry.h',
+        '../services/shell/public/cpp/lib/application_runner.cc',
+        '../services/shell/public/cpp/lib/capabilities.cc',
+        '../services/shell/public/cpp/lib/connection_impl.cc',
+        '../services/shell/public/cpp/lib/connection_impl.h',
+        '../services/shell/public/cpp/lib/connector_impl.cc',
+        '../services/shell/public/cpp/lib/connector_impl.h',
+        '../services/shell/public/cpp/lib/identity.cc',
+        '../services/shell/public/cpp/lib/interface_factory_binder.h',
+        '../services/shell/public/cpp/lib/interface_registry.cc',
+        '../services/shell/public/cpp/lib/message_loop_ref.cc',
+        '../services/shell/public/cpp/lib/names.cc',
+        '../services/shell/public/cpp/lib/shell_client.cc',
+        '../services/shell/public/cpp/lib/shell_connection.cc',
+        '../services/shell/public/cpp/message_loop_ref.h',
+        '../services/shell/public/cpp/names.h',
+        '../services/shell/public/cpp/shell.h',
+        '../services/shell/public/cpp/shell_client.h',
+        '../services/shell/public/cpp/shell_connection.h',
       ],
       'dependencies': [
         '../base/base.gyp:base_i18n',
@@ -202,7 +202,7 @@
       ],
     },
     {
-      # GN version: //mojo/shell/public/cpp/tests
+      # GN version: //services/shell/public/cpp/tests
       'target_name': 'mojo_public_application_unittests',
       'type': 'executable',
       'dependencies': [
@@ -212,7 +212,7 @@
         'mojo_edk.gyp:mojo_run_all_unittests',
       ],
       'sources': [
-        'shell/public/cpp/tests/interface_registry_unittest.cc',
+        '../services/shell/public/cpp/tests/interface_registry_unittest.cc',
       ],
     },
     {