Move //mojo/services tracing & catalog to //services.

TBR=jam@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1878893002

Cr-Commit-Position: refs/heads/master@{#386921}

ash/mus/BUILD.gn

@@ -39,8 +39,8 @@ source_set("lib") {
     "//mojo/common:common_base",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
-    "//mojo/services/tracing/public/cpp",
     "//services/shell/public/cpp",
+    "//services/tracing/public/cpp",
     "//skia/public",
     "//ui/app_list/shower",
     "//ui/aura",

ash/mus/DEPS

@@ -9,8 +9,8 @@ include_rules = [
   "+mojo/common",
   "+mojo/converters",
   "+mojo/public",
-  "+mojo/services/tracing/public",
   "+services/shell/public",
+  "+services/tracing/public",
   "+skia/public",
   "+third_party/khronos/GLES2/gl2.h",
 ]

ash/mus/sysui_application.h

@@ -10,8 +10,8 @@
 #include "base/macros.h"
 #include "mash/shelf/public/interfaces/shelf.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/shell_client.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 
 namespace ash {
 namespace sysui {

build/all.gyp

@@ -141,6 +141,7 @@
             '../ppapi/ppapi.gyp:*',
             '../ppapi/ppapi_internal.gyp:*',
             '../ppapi/tools/ppapi_tools.gyp:*',
+            '../services/shell/shell.gyp:*',
             '../skia/skia.gyp:*',
             '../sync/tools/sync_tools.gyp:*',
             '../third_party/catapult/telemetry/telemetry.gyp:*',

build/gn_migration.gypi

@@ -71,7 +71,6 @@
         '../media/media.gyp:media_perftests',
         '../media/media.gyp:media_unittests',
         '../media/midi/midi.gyp:midi_unittests',
-        '../mojo/mojo_base.gyp:mojo_application_base',
         '../net/net.gyp:dump_cache',
         '../net/net.gyp:net_perftests',
         '../net/net.gyp:net_unittests',

chrome/chrome_browser.gypi

@@ -3345,7 +3345,6 @@
             '../media/media.gyp:media',
             '../media/midi/midi.gyp:midi',
             '../media/mojo/interfaces/mojo_bindings.gyp:platform_verification_api',
-            '../mojo/mojo_base.gyp:mojo_application_base',
             '../mojo/mojo_base.gyp:mojo_common_lib',
             '../mojo/mojo_base.gyp:mojo_url_type_converters',
             '../mojo/mojo_edk.gyp:mojo_system_impl',
@@ -3354,6 +3353,7 @@
             '../mojo/mojo_public.gyp:mojo_message_pump_lib',
             '../net/net.gyp:net_extras',
             '../net/net.gyp:net_with_v8',
+            '../services/shell/shell.gyp:shell_public',
             '../storage/storage_browser.gyp:storage',
             '../storage/storage_common.gyp:storage_common',
             '../third_party/re2/re2.gyp:re2',

chrome/test/base/mojo_test_connector.cc

@@ -18,7 +18,7 @@
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/process_delegate.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/catalog/store.h"
+#include "services/catalog/store.h"
 #include "services/shell/background/tests/test_catalog_store.h"
 #include "services/shell/native_runner_delegate.h"
 #include "services/shell/public/cpp/connector.h"

components/filesystem/BUILD.gn

@@ -47,8 +47,8 @@ mojo_native_application("filesystem") {
     "//mojo/platform_handle:for_shared_library",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
-    "//mojo/services/tracing/public/cpp",
     "//services/shell/public/cpp",
+    "//services/tracing/public/cpp",
   ]
 
   data_deps = [

components/filesystem/DEPS

@@ -1,9 +1,9 @@
 include_rules = [
   "+components/prefs",
   "+mojo/common",
-  "+services/shell",
   "+mojo/platform_handle",
   "+mojo/public",
-  "+mojo/services/tracing/public/cpp",
   "+mojo/util",
+  "+services/shell",
+  "+services/tracing/public/cpp",
 ]

components/filesystem/file_system_app.h

@@ -10,9 +10,9 @@
 #include "components/filesystem/file_system_impl.h"
 #include "components/filesystem/lock_table.h"
 #include "components/filesystem/public/interfaces/file_system.mojom.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/shell_client.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 
 namespace mojo {
 class Connector;

components/filesystem/filesystem.gyp

@@ -31,11 +31,10 @@
       ],
       'dependencies': [
         'filesystem_bindings',
-        '../../mojo/mojo_base.gyp:mojo_application_base',
-        '../../mojo/mojo_base.gyp:mojo_application_bindings',
         '../../mojo/mojo_edk.gyp:mojo_system_impl',
         '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../../mojo/mojo_platform_handle.gyp:platform_handle',
+        '../../services/shell/shell.gyp:shell_public',
         '../../url/url.gyp:url_lib',
       ],
       'export_dependent_settings': [

components/font_service/BUILD.gn

@@ -17,8 +17,8 @@ source_set("lib") {
     "//mojo/common:common_base",
     "//mojo/platform_handle",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/tracing/public/cpp",
     "//services/shell/public/cpp",
+    "//services/tracing/public/cpp",
   ]
 
   public_deps = [

components/font_service/DEPS

@@ -4,7 +4,7 @@ include_rules = [
   "+mojo/message_pump",
   "+mojo/platform_handle",
   "+mojo/public",
-  "+mojo/services/tracing/public/cpp",
+  "+services/tracing/public/cpp",
   "+skia",
   "+third_party/skia/include",
 ]

components/font_service/font_service_app.h

@@ -11,9 +11,9 @@
 #include "base/macros.h"
 #include "components/font_service/public/interfaces/font_service.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/shell_client.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 #include "skia/ext/skia_utils_base.h"
 
 namespace font_service {

components/leveldb/BUILD.gn

@@ -44,8 +44,8 @@ mojo_native_application("leveldb") {
     "//mojo/platform_handle:for_shared_library",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
-    "//mojo/services/tracing/public/cpp",
     "//services/shell/public/cpp",
+    "//services/tracing/public/cpp",
   ]
 
   data_deps = [

components/leveldb/DEPS

@@ -4,8 +4,8 @@ include_rules = [
   "+mojo/message_pump",
   "+mojo/platform_handle",
   "+mojo/public",
-  "+mojo/services/tracing/public/cpp",
-  "+services/shell",
   "+mojo/util",
+  "+services/shell",
+  "+services/tracing/public/cpp",
   "+third_party/leveldatabase",
 ]

components/leveldb/leveldb.gyp

@@ -30,8 +30,8 @@
       'dependencies': [
         'leveldb_public_lib',
         '../../components/filesystem/filesystem.gyp:filesystem_lib',
-        '../../mojo/mojo_base.gyp:mojo_application_base',
         '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../services/shell/shell.gyp:shell_public',
         '../../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
       ]
     },
@@ -47,9 +47,9 @@
       ],
       'dependencies': [
         'leveldb_bindings_mojom',
-        '../../mojo/mojo_base.gyp:mojo_application_base',
         '../../mojo/mojo_edk.gyp:mojo_system_impl',
         '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../services/shell/shell.gyp:shell_public',
         '../../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
       ]
     },

components/leveldb/leveldb_app.h

@@ -7,9 +7,9 @@
 
 #include "components/leveldb/public/interfaces/leveldb.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/shell_client.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 
 namespace leveldb {
 

components/mus/BUILD.gn

@@ -21,6 +21,7 @@ mojo_native_application("mus") {
     ":resources_strings",
     "//mojo/platform_handle:for_shared_library",
     "//services/shell/public/cpp:sources",
+    "//services/tracing/public/interfaces",
   ]
 
   if (is_win) {
@@ -80,8 +81,8 @@ source_set("lib") {
     "//components/mus/ws:lib",
     "//components/resource_provider/public/cpp",
     "//mojo/common:common_base",
-    "//mojo/services/tracing/public/cpp",
     "//services/shell/public/cpp",
+    "//services/tracing/public/cpp",
     "//ui/events",
     "//ui/events/ozone:events_ozone_layout",
     "//ui/gl:gl",

components/mus/DEPS

@@ -6,8 +6,8 @@ include_rules = [
   "+mojo/common",
   "+mojo/converters",
   "+mojo/public",
-  "+mojo/services/tracing/public",
   "+services/shell",
+  "+services/tracing/public",
   "+third_party/skia/include",
   "+ui",
 ]

components/mus/mus_app.cc

@@ -23,9 +23,9 @@
 #include "components/mus/ws/window_tree_host_factory.h"
 #include "components/resource_provider/public/cpp/resource_loader.h"
 #include "mojo/public/c/system/main.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/events/event_switches.h"

components/mus/mus_app.h

@@ -21,10 +21,10 @@
 #include "components/mus/ws/platform_display_init_params.h"
 #include "components/mus/ws/user_id.h"
 #include "components/mus/ws/window_server_delegate.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/application_runner.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/shell_client.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 
 namespace mojo {
 class Connector;

components/mus/surfaces/BUILD.gn

@@ -30,8 +30,8 @@ source_set("surfaces") {
     "//gpu/command_buffer/client:gles2_interface",
     "//mojo/converters/geometry",
     "//mojo/converters/surfaces",
-    "//mojo/services/tracing/public/cpp",
     "//services/shell/public/cpp",
+    "//services/tracing/public/cpp",
     "//ui/gfx",
     "//ui/gl",
     "//ui/mojo/geometry:interfaces",

components/mus/ws/BUILD.gn

@@ -97,9 +97,9 @@ source_set("lib") {
     "//mojo/converters/input_events",
     "//mojo/converters/surfaces",
     "//mojo/public/cpp/bindings:callback",
-    "//mojo/services/tracing/public/cpp",
     "//services/shell/public/cpp",
     "//services/shell/public/interfaces",
+    "//services/tracing/public/cpp",
     "//ui/base",
     "//ui/events",
     "//ui/events/platform",

components/profile_service/BUILD.gn

@@ -25,9 +25,9 @@ source_set("lib") {
     "//mojo/common:common_base",
     "//mojo/message_pump",
     "//mojo/platform_handle",
-    "//mojo/services/tracing/public/cpp",
     "//services/shell/public/cpp",
     "//services/shell/public/interfaces",
+    "//services/tracing/public/cpp",
     "//url",
   ]
 }

components/profile_service/DEPS

@@ -5,7 +5,7 @@ include_rules = [
   "+mojo/message_pump",
   "+mojo/platform_handle",
   "+mojo/public",
-  "+mojo/services/tracing/public/cpp",
-  "+services/shell",
   "+mojo/util",
+  "+services/shell",
+  "+services/tracing/public/cpp",
 ]

components/profile_service/profile_app.h

@@ -10,9 +10,9 @@
 #include "components/leveldb/public/interfaces/leveldb.mojom.h"
 #include "components/profile_service/public/interfaces/profile.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/shell_client.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 
 namespace profile {
 

components/profile_service/profile_service.gyp

@@ -30,9 +30,8 @@
         '../../base/base.gyp:base',
         '../../components/filesystem/filesystem.gyp:filesystem_lib',
         '../../components/leveldb/leveldb.gyp:leveldb_lib',
-        '../../mojo/mojo_base.gyp:mojo_application_base',
-        '../../mojo/mojo_base.gyp:mojo_application_bindings',
-        '../../mojo/mojo_base.gyp:tracing_service',
+        '../../services/shell/shell.gyp:shell_public',
+        '../../services/tracing/tracing.gyp:tracing_lib',
         '../../mojo/mojo_edk.gyp:mojo_system_impl',
         '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../../mojo/mojo_platform_handle.gyp:platform_handle',

components/resource_provider/BUILD.gn

@@ -104,8 +104,8 @@ source_set("lib") {
     "//components/resource_provider/public/interfaces",
     "//mojo/common:common_base",
     "//mojo/platform_handle",
-    "//mojo/services/tracing/public/cpp",
     "//services/shell/public/cpp",
+    "//services/tracing/public/cpp",
     "//url",
   ]
 }

components/resource_provider/DEPS

@@ -4,5 +4,5 @@ include_rules = [
   "+mojo/converters",
   "+mojo/platform_handle",
   "+mojo/public",
-  "+mojo/services/tracing/public/cpp",
+  "+services/tracing/public/cpp",
 ]

components/resource_provider/resource_provider_app.h

@@ -11,9 +11,9 @@
 #include "components/resource_provider/public/interfaces/resource_provider.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/shell_client.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 
 namespace resource_provider {
 

content/BUILD.gn

@@ -117,7 +117,7 @@ grit("resources") {
   deps = [
     "//content/public/app:browser_manifest",
     "//content/public/app:renderer_manifest",
-    "//mojo/services/catalog:manifest",
+    "//services/catalog:manifest",
   ]
 }
 

content/browser/mojo/mojo_shell_context.cc

@@ -32,9 +32,9 @@
 #include "content/public/common/service_registry.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/string.h"
-#include "mojo/services/catalog/factory.h"
-#include "mojo/services/catalog/manifest_provider.h"
-#include "mojo/services/catalog/store.h"
+#include "services/catalog/factory.h"
+#include "services/catalog/manifest_provider.h"
+#include "services/catalog/store.h"
 #include "services/shell/connect_params.h"
 #include "services/shell/loader.h"
 #include "services/shell/native_runner.h"

content/content.gyp

@@ -462,7 +462,6 @@
             '../device/usb/usb.gyp:device_usb_java',
             '../device/vibration/vibration.gyp:device_vibration_java',
             '../media/media.gyp:media_java',
-            '../mojo/mojo_base.gyp:mojo_application_bindings',
             '../mojo/mojo_base.gyp:mojo_system_java',
             '../mojo/mojo_public.gyp:mojo_bindings_java',
             '../net/net.gyp:net',

content/content_browser.gypi

@@ -24,20 +24,20 @@
     '../gpu/gpu.gyp:gpu',
     '../gpu/gpu.gyp:gpu_ipc_client',
     '../gpu/gpu.gyp:gpu_ipc_common',
-    '../mojo/mojo_base.gyp:mojo_application_base',
     '../mojo/mojo_base.gyp:mojo_geometry_lib',
     '../mojo/mojo_base.gyp:mojo_url_type_converters',
-    '../mojo/mojo_base.gyp:tracing_service',
-    '../mojo/mojo_base.gyp:tracing_service_lib',
     '../mojo/mojo_public.gyp:mojo_cpp_bindings',
     '../mojo/mojo_public.gyp:mojo_js_bindings',
-    '../mojo/mojo_shell.gyp:mojo_runner_common_lib',
-    '../mojo/mojo_shell.gyp:mojo_runner_host_lib',
-    '../mojo/mojo_shell.gyp:mojo_shell_lib',
     '../net/net.gyp:http_server',
     '../net/net.gyp:net',
     '../net/net.gyp:net_extras',
     '../sandbox/sandbox.gyp:sandbox',
+    '../services/shell/shell.gyp:shell_lib',
+    '../services/shell/shell.gyp:shell_public',
+    '../services/shell/shell.gyp:shell_runner_common_lib',
+    '../services/shell/shell.gyp:shell_runner_host_lib',
+    '../services/tracing/tracing.gyp:tracing_lib',
+    '../services/tracing/tracing.gyp:tracing_public',
     '../skia/skia.gyp:skia',
     '../skia/skia.gyp:skia_mojo',
     '../sql/sql.gyp:sql',

content/content_child.gypi

@@ -11,7 +11,7 @@
     '../ipc/ipc.gyp:ipc',
     '../mojo/mojo_base.gyp:mojo_common_lib',
     '../mojo/mojo_public.gyp:mojo_message_pump_lib',
-    '../mojo/mojo_shell.gyp:mojo_runner_common_lib',
+    '../services/shell/shell.gyp:shell_runner_common_lib',
     '../skia/skia.gyp:skia',
     '../storage/storage_common.gyp:storage_common',
     '../third_party/WebKit/public/blink.gyp:blink',

content/content_common.gypi

@@ -30,11 +30,11 @@
     '../media/gpu/ipc/media_ipc.gyp:media_gpu_ipc_client',
     '../media/gpu/ipc/media_ipc.gyp:media_gpu_ipc_common',
     '../media/midi/midi.gyp:midi',
-    '../mojo/mojo_base.gyp:mojo_application_bindings',
     '../mojo/mojo_edk.gyp:mojo_system_impl',
     '../mojo/mojo_public.gyp:mojo_cpp_bindings',
-    '../mojo/mojo_shell.gyp:mojo_runner_common_lib',
     '../net/net.gyp:net',
+    '../services/shell/shell.gyp:shell_public',
+    '../services/shell/shell.gyp:shell_runner_common_lib',
     '../skia/skia.gyp:skia',
     '../storage/storage_common.gyp:storage_common',
     '../third_party/WebKit/public/blink.gyp:blink',
@@ -86,8 +86,8 @@
   ],
   'export_dependent_settings': [
     '../base/base.gyp:base',
-    '../mojo/mojo_base.gyp:mojo_application_bindings',
     '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+    '../services/shell/shell.gyp:shell_public',
     # The public content API headers directly include Blink API headers, so we
     # have to export the blink header settings so that relative paths in these
     # headers resolve correctly.

content/content_common_mojo_bindings.gyp

@@ -34,8 +34,8 @@
       },
       'dependencies': [
         '../components/leveldb/leveldb.gyp:leveldb_bindings_mojom',
-        '../mojo/mojo_base.gyp:mojo_application_bindings',
         '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../services/shell/shell.gyp:shell_public',
         '../skia/skia.gyp:skia_mojo',
         '../third_party/WebKit/public/blink.gyp:mojo_bindings',
         '../ui/mojo/geometry/mojo_bindings.gyp:mojo_geometry_bindings',

content/content_renderer.gypi

@@ -22,11 +22,11 @@
     '../jingle/jingle.gyp:jingle_glue',
     '../media/blink/media_blink.gyp:media_blink',
     '../media/media.gyp:media',
-    '../mojo/mojo_base.gyp:mojo_application_bindings',
     '../mojo/mojo_base.gyp:mojo_geometry_lib',
     '../mojo/mojo_base.gyp:mojo_url_type_converters',
     '../mojo/mojo_edk.gyp:mojo_js_lib',
     '../net/net.gyp:net',
+    '../services/shell/shell.gyp:shell_public',
     '../skia/skia.gyp:skia',
     '../skia/skia.gyp:skia_mojo',
     '../storage/storage_common.gyp:storage_common',

content/content_resources.grd

@@ -27,7 +27,7 @@
       <include name="IDR_INDEXED_DB_INTERNALS_CSS" file="browser/resources/indexed_db/indexeddb_internals.css" flattenhtml="true" type="BINDATA" />
       <include name="IDR_MEDIA_INTERNALS_HTML" file="browser/resources/media/media_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
       <include name="IDR_MEDIA_INTERNALS_JS" file="browser/resources/media/media_internals.js" flattenhtml="true" type="BINDATA" />
-      <include name="IDR_MOJO_CATALOG_MANIFEST" file="../mojo/services/catalog/manifest.json" type="BINDATA" />
+      <include name="IDR_MOJO_CATALOG_MANIFEST" file="../services/catalog/manifest.json" type="BINDATA" />
       <include name="IDR_MOJO_CONTENT_BROWSER_MANIFEST" file="${root_out_dir}/content_browser_manifest.json" use_base_dir="false" type="BINDATA" />
       <include name="IDR_MOJO_CONTENT_RENDERER_MANIFEST" file="${root_out_dir}/content_renderer_manifest.json" use_base_dir="false" type="BINDATA" />
       <include name="IDR_NETWORK_ERROR_LISTING_HTML" file="browser/resources/net/network_errors_listing.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />

content/content_resources.gypi

@@ -32,7 +32,7 @@
         },
       ],
       'dependencies': [
-        '<(DEPTH)/mojo/mojo_shell.gyp:mojo_catalog_manifest',
+        '<(DEPTH)/services/shell/shell.gyp:catalog_manifest',
         'content_app_browser_manifest',
         'content_app_renderer_manifest',
       ],

content/content_tests.gypi

@@ -844,7 +844,6 @@
         '../media/media.gyp:media',
         '../media/midi/midi.gyp:midi',
         '../mojo/mojo_edk.gyp:mojo_common_test_support',
-        '../mojo/mojo_base.gyp:mojo_application_base',
         '../mojo/mojo_edk.gyp:mojo_system_impl',
         '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../net/net.gyp:net_test_support',
@@ -852,6 +851,7 @@
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',
         '../ppapi/ppapi_internal.gyp:ppapi_shared',
         '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
+        '../services/shell/shell.gyp:shell_public',
         '../skia/skia.gyp:skia',
         '../storage/storage_browser.gyp:storage',
         '../storage/storage_common.gyp:storage_common',
@@ -1382,7 +1382,6 @@
         '../ipc/ipc.gyp:test_support_ipc',
         '../media/media.gyp:media_test_support',
         '../media/media.gyp:shared_memory_support',
-        '../mojo/mojo_base.gyp:mojo_application_base',
         '../mojo/mojo_base.gyp:mojo_test_support',
         '../mojo/mojo_edk.gyp:mojo_common_test_support',
         '../mojo/mojo_edk.gyp:mojo_system_impl',
@@ -1394,6 +1393,7 @@
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',
         '../ppapi/ppapi_internal.gyp:ppapi_shared',
         '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
+        '../services/shell/shell.gyp:shell_public',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/WebKit/public/blink.gyp:blink',

content/content_utility.gypi

@@ -6,12 +6,11 @@
   'dependencies': [
     '../base/base.gyp:base',
     '../courgette/courgette.gyp:courgette_lib',
-    '../mojo/mojo_base.gyp:mojo_application_base',
-    '../mojo/mojo_base.gyp:mojo_application_bindings',
     '../mojo/mojo_base.gyp:mojo_common_lib',
     '../mojo/mojo_public.gyp:mojo_cpp_bindings',
     '../mojo/mojo_public.gyp:mojo_message_pump_lib',
-    '../mojo/mojo_shell.gyp:mojo_shell_lib',
+    '../services/shell/shell.gyp:shell_public',
+    '../services/shell/shell.gyp:shell_lib',
     '../url/url.gyp:url_lib',
   ],
   'variables': {

extensions/extensions_tests.gyp

@@ -26,10 +26,10 @@
         '../device/hid/hid.gyp:device_hid',
         '../device/serial/serial.gyp:device_serial',
         '../device/serial/serial.gyp:device_serial_test_util',
-        '../mojo/mojo_base.gyp:mojo_application_bindings',
         '../mojo/mojo_edk.gyp:mojo_js_lib',
         '../mojo/mojo_edk.gyp:mojo_system_impl',
         '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../services/shell/shell.gyp:shell_public',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',

mash/DEPS

@@ -3,13 +3,12 @@ include_rules = [
   "+components/mus/common/util.h",
   "+components/mus/public",
   "+components/prefs",
-  "+services/shell",
   "+mojo/common",
   "+mojo/converters",
   "+mojo/public",
-  "+mojo/services/catalog/public",
-  "+mojo/services/network/public",
-  "+mojo/services/tracing/public",
+  "+services/catalog/public",
+  "+services/shell",
+  "+services/tracing/public",
   "+third_party/skia/include",
   "+ui",
 ]

mash/example/views_examples/BUILD.gn

@@ -22,9 +22,9 @@ mojo_native_application("views_examples") {
     "//components/mus/public/interfaces",
     "//mojo/converters/geometry",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/tracing/public/cpp",
     "//services/shell/public/cpp",
     "//services/shell/public/cpp:sources",
+    "//services/tracing/public/cpp",
     "//skia",
     "//ui/gfx",
     "//ui/gfx/geometry",

mash/example/views_examples/views_examples_application_delegate.h

@@ -8,8 +8,8 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/shell_client.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 
 namespace views {
 class AuraInit;

mash/init/BUILD.gn

@@ -23,8 +23,8 @@ mojo_native_application("init") {
     "//mash/init/public/interfaces",
     "//mash/login/public/interfaces",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/tracing/public/cpp",
     "//services/shell/public/cpp",
+    "//services/tracing/public/cpp",
   ]
 
   data_deps = [

mash/login/BUILD.gn

@@ -22,8 +22,8 @@ mojo_native_application("login") {
     "//mash/login/public/interfaces",
     "//mash/wm/public/interfaces",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/tracing/public/cpp",
     "//services/shell/public/cpp",
+    "//services/tracing/public/cpp",
     "//ui/views",
     "//ui/views/mus:for_mojo_application",
   ]

mash/login/login.cc

@@ -17,9 +17,9 @@
 #include "mash/login/public/interfaces/login.mojom.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/shell_client.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/mus/aura_init.h"

mash/quick_launch/BUILD.gn

@@ -17,10 +17,10 @@ source_set("lib") {
   deps = [
     "//base",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/catalog/public/interfaces",
-    "//mojo/services/tracing/public/cpp",
+    "//services/catalog/public/interfaces",
     "//services/shell/public/cpp",
     "//services/shell/public/interfaces",
+    "//services/tracing/public/cpp",
     "//ui/views",
     "//ui/views/mus:for_mojo_application",
     "//url",

mash/quick_launch/quick_launch_application.cc

@@ -10,10 +10,10 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/c/system/main.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/application_runner.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/shell_client.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"

mash/quick_launch/quick_launch_application.h

@@ -8,9 +8,9 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
+#include "services/catalog/public/interfaces/catalog.mojom.h"
 #include "services/shell/public/cpp/shell_client.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 
 namespace views {
 class AuraInit;

mash/screenlock/BUILD.gn

@@ -22,9 +22,9 @@ mojo_native_application("screenlock") {
     "//mash/wm/public/interfaces",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/tracing/public/cpp",
     "//services/shell/public/cpp",
     "//services/shell/public/cpp:sources",
+    "//services/tracing/public/cpp",
     "//ui/views",
     "//ui/views/mus:for_mojo_application",
   ]

mash/screenlock/screenlock.h

@@ -11,8 +11,8 @@
 #include "base/macros.h"
 #include "mash/session/public/interfaces/session.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/shell_client.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 
 namespace views {
 class AuraInit;

mash/task_viewer/BUILD.gn

@@ -16,11 +16,11 @@ source_set("lib") {
   deps = [
     "//base",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/catalog/public/interfaces",
-    "//mojo/services/tracing/public/cpp",
+    "//services/catalog/public/interfaces",
     "//services/shell/public/cpp",
     "//services/shell/public/cpp:sources",
     "//services/shell/public/interfaces",
+    "//services/tracing/public/cpp",
     "//ui/resources",
     "//ui/views",
     "//ui/views/mus:for_mojo_application",

mash/task_viewer/task_viewer.cc

@@ -15,7 +15,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
+#include "services/catalog/public/interfaces/catalog.mojom.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/interfaces/shell.mojom.h"

mash/task_viewer/task_viewer.h

@@ -10,8 +10,8 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/shell_client.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 
 namespace views {
 class AuraInit;

mash/wm/BUILD.gn

@@ -72,8 +72,8 @@ source_set("lib") {
     "//mojo/common:common_base",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
-    "//mojo/services/tracing/public/cpp",
     "//services/shell/public/cpp",
+    "//services/tracing/public/cpp",
     "//skia",
     "//ui/aura",
     "//ui/events",

mash/wm/window_manager_application.cc

@@ -16,9 +16,9 @@
 #include "mash/wm/root_windows_observer.h"
 #include "mash/wm/user_window_controller_impl.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 #include "ui/events/event.h"
 #include "ui/mojo/init/ui_init.h"
 #include "ui/views/mus/aura_init.h"

mash/wm/window_manager_application.h

@@ -21,8 +21,8 @@
 #include "mash/wm/public/interfaces/user_window_controller.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "services/shell/public/cpp/shell_client.h"
+#include "services/tracing/public/cpp/tracing_impl.h"
 
 namespace ui {
 namespace mojo {

media/mojo/interfaces/mojo_bindings.gyp

@@ -17,8 +17,8 @@
       'type': 'static_library',
       'dependencies': [
         'platform_verification_mojo_bindings',
-        '../../../mojo/mojo_base.gyp:mojo_application_bindings',
         '../../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../../services/shell/shell.gyp:shell_public',
       ],
       'sources': [
         '<(SHARED_INTERMEDIATE_DIR)/media/mojo/interfaces/platform_verification.mojom.cc',
@@ -39,8 +39,8 @@
       'type': 'static_library',
       'dependencies': [
         'provision_fetcher_mojo_bindings',
-        '../../../mojo/mojo_base.gyp:mojo_application_bindings',
         '../../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../../services/shell/shell.gyp:shell_public',
       ],
       'sources': [
         '<(SHARED_INTERMEDIATE_DIR)/media/mojo/interfaces/provision_fetcher.mojom.cc',

mojo/BUILD.gn

@@ -10,7 +10,6 @@ group("mojo") {
   deps = [
     ":tests",
     "//mojo/common",
-    "//mojo/services",
   ]
 
   if (!(is_linux && target_cpu == "x86")) {

mojo/common/DEPS

@@ -9,9 +9,9 @@ include_rules = [
 
 specific_include_rules = {
   "trace_controller_impl\.h": [
-    "+mojo/services/tracing/public/interfaces/tracing.mojom.h"
+    "+services/tracing/public/interfaces/tracing.mojom.h"
   ],
   "tracing_impl\.h": [
-    "+mojo/services/tracing/public/interfaces/tracing.mojom.h"
+    "+services/tracing/public/interfaces/tracing.mojom.h"
   ],
 }

mojo/mojo_base.gyp

@@ -119,75 +119,6 @@
         'message_pump/message_pump_mojo_unittest.cc',
       ],
     },
-    {
-      'target_name': 'mojo_application_bindings_mojom',
-      'type': 'none',
-      'variables': {
-        'mojom_files': [
-          'services/catalog/public/interfaces/catalog.mojom',
-          'services/catalog/public/interfaces/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: //services/shell/public/cpp
-      'target_name': 'mojo_application_base',
-      'type': 'static_library',
-      'sources': [
-        '../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',
-        'mojo_application_bindings',
-        'mojo_public.gyp:mojo_message_pump_lib',
-      ],
-    },
-    {
-      # GN version: //mojo/public/interfaces/application:application
-      'target_name': 'mojo_application_bindings',
-      'type': 'static_library',
-      'dependencies': [
-        'mojo_application_bindings_mojom',
-        'mojo_public.gyp:mojo_cpp_bindings',
-      ],
-    },
     {
       # GN version: //mojo/test:test_support
       'target_name': 'mojo_test_support',
@@ -201,60 +132,6 @@
         'test/test_utils_win.cc',
       ],
     },
-    {
-      # GN version: //services/shell/public/cpp/tests
-      'target_name': 'mojo_public_application_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../testing/gtest.gyp:gtest',
-        'mojo_application_base',
-        'mojo_edk.gyp:mojo_run_all_unittests',
-      ],
-      'sources': [
-        '../services/shell/public/cpp/tests/interface_registry_unittest.cc',
-      ],
-    },
-    {
-      # Technically, these should be in the mojo_services.gyp, but this causes
-      # a cycle since the ios generator can't have gyp files refer to each
-      # other, even if the targets don't form a cycle.
-      #
-      # GN version: //mojo/services/tracing:lib
-      'target_name': 'tracing_service',
-      'type': 'static_library',
-      'dependencies': [
-        'mojo_services.gyp:tracing_service_bindings_lib',
-        'mojo_base.gyp:mojo_application_bindings',
-        'mojo_edk.gyp:mojo_system_impl',
-      ],
-      'sources': [
-        'services/tracing/trace_data_sink.cc',
-        'services/tracing/trace_data_sink.h',
-        'services/tracing/trace_recorder_impl.cc',
-        'services/tracing/trace_recorder_impl.h',
-        'services/tracing/tracing_app.cc',
-        'services/tracing/tracing_app.h',
-      ],
-    },
-    {
-      # GN version: //mojo/services/public/cpp
-      'target_name': 'tracing_service_lib',
-      'type': 'static_library',
-      'dependencies': [
-        'mojo_services.gyp:tracing_service_bindings_lib',
-        'mojo_base.gyp:mojo_application_bindings',
-        'mojo_edk.gyp:mojo_system_impl',
-      ],
-      'sources': [
-        'services/tracing/public/cpp/switches.cc',
-        'services/tracing/public/cpp/switches.h',
-        'services/tracing/public/cpp/tracing_impl.cc',
-        'services/tracing/public/cpp/tracing_impl.h',
-        'services/tracing/public/cpp/trace_provider_impl.cc',
-        'services/tracing/public/cpp/trace_provider_impl.h',
-      ],
-    },
   ],
   'conditions': [
     ['OS=="android"', {

mojo/mojo_services.gyp

@@ -1,29 +0,0 @@
-# Copyright 2015 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.
-
-{
-  'targets': [
-    {
-      'target_name': 'tracing_service_bindings_mojom',
-      'type': 'none',
-      'variables': {
-        'mojom_files': [
-          'services/tracing/public/interfaces/tracing.mojom',
-        ],
-        'mojom_include_path': '<(DEPTH)/mojo/services',
-      },
-      'includes': [
-        'mojom_bindings_generator_explicit.gypi',
-      ],
-    },
-    {
-      # GN version: //mojo/services/tracing/public/interfaces
-      'target_name': 'tracing_service_bindings_lib',
-      'type': 'static_library',
-      'dependencies': [
-        'tracing_service_bindings_mojom',
-      ],
-    },
-  ],
-}

mojo/mojo_shell.gyp

@@ -1,164 +0,0 @@
-# Copyright 2015 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.
-
-{
-  'targets': [{
-    'target_name': 'mojo_shell_lib',
-    'type': 'static_library',
-    'sources': [
-      'services/catalog/catalog.cc',
-      'services/catalog/catalog.h',
-      'services/catalog/entry.cc',
-      'services/catalog/entry.h',
-      'services/catalog/factory.cc',
-      'services/catalog/factory.h',
-      'services/catalog/store.cc',
-      'services/catalog/store.h',
-      'services/catalog/types.h',
-      '../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',
-    ],
-    'dependencies': [
-      '<(DEPTH)/base/base.gyp:base',
-      '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-      '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_base',
-      '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings',
-      '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_lib',
-      '<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters',
-      '<(DEPTH)/net/net.gyp:net',
-      '<(DEPTH)/url/url.gyp:url_lib',
-    ],
-    'export_dependent_settings': [
-      '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings',
-    ],
-  }, {
-    'target_name': 'mojo_shell_unittests',
-    'type': 'executable',
-    'sources': [
-      '../services/shell/tests/loader_unittest.cc',
-    ],
-    'dependencies': [
-      'mojo_shell_lib',
-      'mojo_shell_test_bindings',
-      '<(DEPTH)/base/base.gyp:base',
-      '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_base',
-      '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_lib',
-      '<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters',
-      '<(DEPTH)/mojo/mojo_edk.gyp:mojo_run_all_unittests',
-      '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings',
-      '<(DEPTH)/testing/gtest.gyp:gtest',
-      '<(DEPTH)/url/url.gyp:url_lib',
-    ]
-  }, {
-    'target_name': 'mojo_shell_test_bindings',
-    'type': 'static_library',
-    'variables': {
-      'mojom_files': [
-        '../services/shell/tests/test.mojom',
-      ],
-    },
-    'includes': [
-      'mojom_bindings_generator_explicit.gypi',
-    ],
-  }, {
-    'target_name': 'mojo_runner_common_lib',
-    'type': 'static_library',
-    'sources': [
-      '../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': [
-      '..',
-    ],
-    'dependencies': [
-      '<(DEPTH)/base/base.gyp:base',
-      '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings',
-      '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl',
-      '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings',
-      '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_system',
-    ],
-    'export_dependent_settings': [
-      '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings',
-    ],
-  }, {
-    'target_name': 'mojo_runner_host_lib',
-    'type': 'static_library',
-    'sources': [
-      '../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',
-      'mojo_shell_lib',
-      '<(DEPTH)/base/base.gyp:base',
-      '<(DEPTH)/base/base.gyp:base_i18n',
-      '<(DEPTH)/base/base.gyp:base_static',
-      '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings',
-      '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl',
-      '<(DEPTH)/mojo/mojo_platform_handle.gyp:platform_handle',
-      '<(DEPTH)/mojo/mojo_public.gyp:mojo_message_pump_lib',
-    ],
-    'export_dependent_settings': [
-      '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings',
-    ],
-    'conditions': [
-      ['OS=="linux"', {
-        'sources': [
-          '../services/shell/runner/host/linux_sandbox.cc',
-          '../services/shell/runner/host/linux_sandbox.h',
-        ],
-        'dependencies': [
-          '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
-          '<(DEPTH)/sandbox/sandbox.gyp:sandbox_services',
-          '<(DEPTH)/sandbox/sandbox.gyp:seccomp_bpf',
-          '<(DEPTH)/sandbox/sandbox.gyp:seccomp_bpf_helpers',
-        ],
-      }],
-      ['OS=="mac"', {
-        'sources': [
-          '../services/shell/runner/host/mach_broker.cc',
-          '../services/shell/runner/host/mach_broker.h',
-        ],
-      }],
-    ],
-  }, {
-    # GN version: //mojo/services/catalog:manifest
-    'target_name': 'mojo_catalog_manifest',
-    'type': 'none',
-    'variables': {
-      'application_type': 'mojo',
-      'application_name': 'catalog',
-      'source_manifest': '<(DEPTH)/mojo/services/catalog/manifest.json',
-    },
-    'includes': [
-      '../mojo/public/mojo_application_manifest.gypi',
-    ],
-    'hard_dependency': 1,
-  }],
-}

mojo/services/BUILD.gn

@@ -1,14 +0,0 @@
-# Copyright 2014 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.
-
-import("//build/config/ui.gni")
-
-group("services") {
-  # Meta-target, don't link into production code.
-  testonly = true
-  deps = [
-    "//mojo/services/catalog",
-    "//mojo/services/tracing",
-  ]
-}

mojo/services/DEPS

@@ -1,6 +0,0 @@
-include_rules = [
-  "-mojo",
-  "+mojo/common",
-  "+mojo/public",
-  "+services/shell/public",
-]

mojo/services/public/build/config/BUILD.gn

@@ -1,22 +0,0 @@
-# Copyright 2015 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.
-
-# The absolute path to the directory containing the Mojo services produced
-# out of Chromium.
-mojo_services_root = get_path_info("../../..", "abspath")
-
-# NOTE: This config name must be in sync with the name of the config used by
-# services that developed out of the Mojo repo so that Chromium's services'
-# BUILD.gn files can work seamlessly in Chromium and when pulled into Mojo or a
-# client repo.
-config("mojo_services") {
-  include_dirs = [
-    # Include paths in Chromium Mojo services' client-side code are specified
-    # relative to the directory holding the services' client-side code.
-    mojo_services_root,
-
-    # The same goes for files generated from mojoms.
-    root_gen_dir + mojo_services_root,
-  ]
-}

services/catalog/BUILD.gn

@@ -30,8 +30,8 @@ source_set("lib") {
   deps = [
     "//base",
     "//mojo/common:url_type_converters",
-    "//mojo/services/catalog/public/interfaces",
     "//mojo/util:filename_util",
+    "//services/catalog/public/interfaces",
     "//services/shell/public/cpp",
   ]
 

services/catalog/DEPS

@@ -1,6 +1,5 @@
 include_rules = [
   "+base",
-  "+mojo/common",
+  "+mojo",
   "+services/shell/public",
-  "+mojo/util",
 ]

services/catalog/catalog.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/catalog/catalog.h"
+#include "services/catalog/catalog.h"
 
 #include "base/bind.h"
 #include "base/json/json_file_value_serializer.h"
@@ -11,9 +11,9 @@
 #include "base/task_runner_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "mojo/common/url_type_converters.h"
-#include "mojo/services/catalog/entry.h"
-#include "mojo/services/catalog/manifest_provider.h"
-#include "mojo/services/catalog/store.h"
+#include "services/catalog/entry.h"
+#include "services/catalog/manifest_provider.h"
+#include "services/catalog/store.h"
 #include "services/shell/public/cpp/names.h"
 #include "url/gurl.h"
 #include "url/url_util.h"

services/catalog/catalog.h

@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_CATALOG_CATALOG_H_
-#define MOJO_SERVICES_CATALOG_CATALOG_H_
+#ifndef SERVICES_CATALOG_CATALOG_H_
+#define SERVICES_CATALOG_CATALOG_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/services/catalog/entry.h"
-#include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
-#include "mojo/services/catalog/public/interfaces/resolver.mojom.h"
-#include "mojo/services/catalog/store.h"
-#include "mojo/services/catalog/types.h"
+#include "services/catalog/entry.h"
+#include "services/catalog/public/interfaces/catalog.mojom.h"
+#include "services/catalog/public/interfaces/resolver.mojom.h"
+#include "services/catalog/store.h"
+#include "services/catalog/types.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/interfaces/shell_resolver.mojom.h"
 
@@ -112,4 +112,4 @@ class Catalog : public mojom::Resolver,
 
 }  // namespace catalog
 
-#endif  // MOJO_SERVICES_CATALOG_CATALOG_H_
+#endif  // SERVICES_CATALOG_CATALOG_H_

services/catalog/entry.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/catalog/entry.h"
+#include "services/catalog/entry.h"
 
 #include "base/values.h"
-#include "mojo/services/catalog/store.h"
 #include "mojo/util/filename_util.h"
+#include "services/catalog/store.h"
 #include "services/shell/public/cpp/names.h"
 #include "url/gurl.h"
 

services/catalog/entry.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_CATALOG_ENTRY_H_
-#define MOJO_SERVICES_CATALOG_ENTRY_H_
+#ifndef SERVICES_CATALOG_ENTRY_H_
+#define SERVICES_CATALOG_ENTRY_H_
 
 #include <set>
 #include <string>
@@ -73,4 +73,4 @@ struct TypeConverter<shell::mojom::ResolveResultPtr, catalog::Entry> {
 };
 }
 
-#endif  // MOJO_SERVICES_CATALOG_ENTRY_H_
+#endif  // SERVICES_CATALOG_ENTRY_H_

services/catalog/entry_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/catalog/entry.h"
+#include "services/catalog/entry.h"
 
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
@@ -35,7 +35,7 @@ class EntryTest : public testing::Test {
     base::FilePath manifest_path;
     PathService::Get(base::DIR_SOURCE_ROOT, &manifest_path);
     manifest_path = manifest_path.AppendASCII(
-        "mojo/services/catalog/data/" + manifest);
+        "services/catalog/data/" + manifest);
 
     JSONFileValueDeserializer deserializer(manifest_path);
     int error = 0;

services/catalog/factory.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/catalog/factory.h"
+#include "services/catalog/factory.h"
 
 #include "base/bind.h"
-#include "mojo/services/catalog/catalog.h"
+#include "services/catalog/catalog.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/shell_connection.h"
 

services/catalog/factory.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_CATALOG_FACTORY_H_
-#define MOJO_SERVICES_CATALOG_FACTORY_H_
+#ifndef SERVICES_CATALOG_FACTORY_H_
+#define SERVICES_CATALOG_FACTORY_H_
 
 #include <map>
 #include <string>
@@ -12,9 +12,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
-#include "mojo/services/catalog/public/interfaces/resolver.mojom.h"
-#include "mojo/services/catalog/types.h"
+#include "services/catalog/public/interfaces/catalog.mojom.h"
+#include "services/catalog/public/interfaces/resolver.mojom.h"
+#include "services/catalog/types.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/shell/public/interfaces/shell_client.mojom.h"
 #include "services/shell/public/interfaces/shell_resolver.mojom.h"
@@ -85,4 +85,4 @@ class Factory
 
 }  // namespace catalog
 
-#endif  // MOJO_SERVICES_CATALOG_FACTORY_H_
+#endif  // SERVICES_CATALOG_FACTORY_H_

services/catalog/manifest_provider.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_CATALOG_MANIFEST_PROVIDER_H_
-#define MOJO_SERVICES_CATALOG_MANIFEST_PROVIDER_H_
+#ifndef SERVICES_CATALOG_MANIFEST_PROVIDER_H_
+#define SERVICES_CATALOG_MANIFEST_PROVIDER_H_
 
 #include <string>
 
@@ -26,4 +26,4 @@ class ManifestProvider {
 
 }  // namespace catalog
 
-#endif  // MOJO_SERVICES_CATALOG_MANIFEST_PROVIDER_H_
+#endif  // SERVICES_CATALOG_MANIFEST_PROVIDER_H_

services/catalog/public/interfaces/BUILD.gn

@@ -9,10 +9,4 @@ mojom("interfaces") {
     "catalog.mojom",
     "resolver.mojom",
   ]
-
-  import_dirs = [ "//mojo/services" ]
-
-  deps = [
-    "//services/shell/public/interfaces",
-  ]
 }

services/catalog/store.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/catalog/store.h"
+#include "services/catalog/store.h"
 
 namespace catalog {
 

services/catalog/store.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_CATALOG_STORE_H_
-#define MOJO_SERVICES_CATALOG_STORE_H_
+#ifndef SERVICES_CATALOG_STORE_H_
+#define SERVICES_CATALOG_STORE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
@@ -51,4 +51,4 @@ class Store {
 
 }  // namespace catalog
 
-#endif  // MOJO_SERVICES_CATALOG_STORE_H_
+#endif  // SERVICES_CATALOG_STORE_H_

services/catalog/types.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_CATALOG_TYPES_H_
-#define MOJO_SERVICES_CATALOG_TYPES_H_
+#ifndef SERVICES_CATALOG_TYPES_H_
+#define SERVICES_CATALOG_TYPES_H_
 
 #include <map>
 #include <string>
@@ -19,4 +19,4 @@ using EntryCache = std::map<std::string, scoped_ptr<Entry>>;
 
 }  // namespace catalog
 
-#endif  // MOJO_SERVICES_CATALOG_TYPES_H_
+#endif  // SERVICES_CATALOG_TYPES_H_

services/shell/BUILD.gn

@@ -38,8 +38,8 @@ source_set("shell") {
     "//base/third_party/dynamic_annotations",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/catalog/public/interfaces",
     "//mojo/util:filename_util",
+    "//services/catalog/public/interfaces",
     "//services/shell/public/cpp:sources",
     "//services/shell/public/interfaces",
     "//url",
@@ -47,7 +47,7 @@ source_set("shell") {
 
   public_deps = [
     # ApplicationManager exposes and uses PackageManager types in its header.
-    "//mojo/services/catalog:lib",
+    "//services/catalog:lib",
   ]
 
   data_deps = [
@@ -55,7 +55,7 @@ source_set("shell") {
   ]
 
   # For services/shell/loader.h
-  allow_circular_includes_from = [ "//mojo/services/catalog:lib" ]
+  allow_circular_includes_from = [ "//services/catalog:lib" ]
 }
 
 mojo_application_manifest("manifest") {

services/shell/background/BUILD.gn

@@ -18,7 +18,7 @@ source_set("lib") {
   deps = [
     "//base",
     "//mojo/message_pump",
-    "//mojo/services/catalog:lib",
+    "//services/catalog:lib",
     "//services/shell",
     "//services/shell/public/cpp:sources",
     "//services/shell/runner:init",

services/shell/background/DEPS

@@ -1,3 +1,3 @@
 include_rules = [
-  "+mojo/services/catalog",
+  "+services/catalog",
 ]

services/shell/background/background_shell.cc

@@ -12,7 +12,7 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/simple_thread.h"
 #include "mojo/message_pump/message_pump_mojo.h"
-#include "mojo/services/catalog/store.h"
+#include "services/catalog/store.h"
 #include "services/shell/connect_params.h"
 #include "services/shell/loader.h"
 #include "services/shell/public/cpp/shell_client.h"

services/shell/background/background_shell.h

@@ -10,7 +10,7 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/catalog/store.h"
+#include "services/catalog/store.h"
 #include "services/shell/public/interfaces/shell_client.mojom.h"
 
 namespace catalog {

services/shell/background/tests/BUILD.gn

@@ -14,7 +14,7 @@ source_set("test_support") {
 
   deps = [
     "//base",
-    "//mojo/services/catalog:lib",
+    "//services/catalog:lib",
     "//url",
   ]
 }

services/shell/background/tests/test_catalog_store.h

@@ -9,7 +9,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "mojo/services/catalog/store.h"
+#include "services/catalog/store.h"
 
 namespace mojo {
 namespace shell {

services/shell/shell.gyp

@@ -0,0 +1,236 @@
+# Copyright 2015 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.
+
+{
+  'targets': [{
+    'target_name': 'shell_interfaces',
+    'type': 'none',
+    'variables': {
+      'mojom_files': [
+        '../catalog/public/interfaces/catalog.mojom',
+        '../catalog/public/interfaces/resolver.mojom',
+        'public/interfaces/capabilities.mojom',
+        'public/interfaces/connector.mojom',
+        'public/interfaces/interface_provider.mojom',
+        'public/interfaces/shell.mojom',
+        'public/interfaces/shell_client.mojom',
+        'public/interfaces/shell_client_factory.mojom',
+        'public/interfaces/shell_resolver.mojom',
+      ],
+    },
+    'includes': [ '../../mojo/mojom_bindings_generator_explicit.gypi' ],
+  },
+  {
+    # GN version: //services/shell/public/cpp
+    'target_name': 'shell_public',
+    'type': 'static_library',
+    'sources': [
+      'public/cpp/application_runner.h',
+      'public/cpp/capabilities.h',
+      'public/cpp/connect.h',
+      'public/cpp/connection.h',
+      'public/cpp/connector.h',
+      'public/cpp/identity.h',
+      'public/cpp/initialize_base_and_icu.cc',
+      'public/cpp/initialize_base_and_icu.h',
+      'public/cpp/interface_binder.h',
+      'public/cpp/interface_factory.h',
+      'public/cpp/interface_factory_impl.h',
+      'public/cpp/interface_registry.h',
+      'public/cpp/lib/application_runner.cc',
+      'public/cpp/lib/capabilities.cc',
+      'public/cpp/lib/connection_impl.cc',
+      'public/cpp/lib/connection_impl.h',
+      'public/cpp/lib/connector_impl.cc',
+      'public/cpp/lib/connector_impl.h',
+      'public/cpp/lib/identity.cc',
+      'public/cpp/lib/interface_factory_binder.h',
+      'public/cpp/lib/interface_registry.cc',
+      'public/cpp/lib/message_loop_ref.cc',
+      'public/cpp/lib/names.cc',
+      'public/cpp/lib/shell_client.cc',
+      'public/cpp/lib/shell_connection.cc',
+      'public/cpp/message_loop_ref.h',
+      'public/cpp/names.h',
+      'public/cpp/shell.h',
+      'public/cpp/shell_client.h',
+      'public/cpp/shell_connection.h',
+    ],
+    'dependencies': [
+      'shell_interfaces',
+      '<(DEPTH)/base/base.gyp:base_i18n',
+      '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings',
+      '<(DEPTH)/mojo/mojo_public.gyp:mojo_message_pump_lib',
+    ],
+  }, {
+    'target_name': 'shell_lib',
+    'type': 'static_library',
+    'sources': [
+      '../catalog/catalog.cc',
+      '../catalog/catalog.h',
+      '../catalog/entry.cc',
+      '../catalog/entry.h',
+      '../catalog/factory.cc',
+      '../catalog/factory.h',
+      '../catalog/store.cc',
+      '../catalog/store.h',
+      '../catalog/types.h',
+      'loader.h',
+      'connect_params.cc',
+      'connect_params.h',
+      'connect_util.cc',
+      'connect_util.h',
+      'native_runner.h',
+      'native_runner_delegate.h',
+      'shell.cc',
+      'shell.h',
+      'switches.cc',
+      'switches.cc',
+      '<(DEPTH)/mojo/util/filename_util.cc',
+      '<(DEPTH)/mojo/util/filename_util.h',
+    ],
+    'dependencies': [
+      'shell_public',
+      '<(DEPTH)/base/base.gyp:base',
+      '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+      '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_lib',
+      '<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters',
+      '<(DEPTH)/net/net.gyp:net',
+      '<(DEPTH)/url/url.gyp:url_lib',
+    ],
+    'export_dependent_settings': [
+      'shell_public',
+    ],
+  }, {
+    'target_name': 'mojo_shell_unittests',
+    'type': 'executable',
+    'sources': [
+      'tests/loader_unittest.cc',
+    ],
+    'dependencies': [
+      'shell_lib',
+      'shell_public',
+      'shell_test_interfaces',
+      '<(DEPTH)/base/base.gyp:base',
+      '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_lib',
+      '<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters',
+      '<(DEPTH)/mojo/mojo_edk.gyp:mojo_run_all_unittests',
+      '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings',
+      '<(DEPTH)/testing/gtest.gyp:gtest',
+      '<(DEPTH)/url/url.gyp:url_lib',
+    ]
+  }, {
+    'target_name': 'shell_test_interfaces',
+    'type': 'static_library',
+    'variables': {
+      'mojom_files': [
+        'tests/test.mojom',
+      ],
+    },
+    'includes': [
+      '../../mojo/mojom_bindings_generator_explicit.gypi',
+    ],
+  }, {
+    'target_name': 'shell_runner_common_lib',
+    'type': 'static_library',
+    'sources': [
+      'runner/common/client_util.cc',
+      'runner/common/client_util.h',
+      'runner/common/switches.cc',
+      'runner/common/switches.h',
+    ],
+    'include_dirs': [
+      '..',
+    ],
+    'dependencies': [
+      'shell_public',
+      '<(DEPTH)/base/base.gyp:base',
+      '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl',
+      '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings',
+      '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_system',
+    ],
+    'export_dependent_settings': [
+      'shell_public',
+    ],
+  }, {
+    'target_name': 'shell_runner_host_lib',
+    'type': 'static_library',
+    'sources': [
+      'runner/host/child_process.cc',
+      'runner/host/child_process.h',
+      'runner/host/child_process_base.cc',
+      'runner/host/child_process_base.h',
+      'runner/host/child_process_host.cc',
+      'runner/host/child_process_host.h',
+      'runner/host/in_process_native_runner.cc',
+      'runner/host/in_process_native_runner.h',
+      'runner/host/out_of_process_native_runner.cc',
+      'runner/host/out_of_process_native_runner.h',
+      'runner/host/native_application_support.cc',
+      'runner/host/native_application_support.h',
+      'runner/init.cc',
+      'runner/init.h',
+    ],
+    'dependencies': [
+      'shell_lib',
+      'shell_public',
+      'shell_runner_common_lib',
+      '<(DEPTH)/base/base.gyp:base',
+      '<(DEPTH)/base/base.gyp:base_i18n',
+      '<(DEPTH)/base/base.gyp:base_static',
+      '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl',
+      '<(DEPTH)/mojo/mojo_platform_handle.gyp:platform_handle',
+      '<(DEPTH)/mojo/mojo_public.gyp:mojo_message_pump_lib',
+    ],
+    'export_dependent_settings': [
+      'shell_public',
+    ],
+    'conditions': [
+      ['OS=="linux"', {
+        'sources': [
+          'runner/host/linux_sandbox.cc',
+          'runner/host/linux_sandbox.h',
+        ],
+        'dependencies': [
+          '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
+          '<(DEPTH)/sandbox/sandbox.gyp:sandbox_services',
+          '<(DEPTH)/sandbox/sandbox.gyp:seccomp_bpf',
+          '<(DEPTH)/sandbox/sandbox.gyp:seccomp_bpf_helpers',
+        ],
+      }],
+      ['OS=="mac"', {
+        'sources': [
+          'runner/host/mach_broker.cc',
+          'runner/host/mach_broker.h',
+        ],
+      }],
+    ],
+  }, {
+    # GN version: //services/catalog:manifest
+    'target_name': 'catalog_manifest',
+    'type': 'none',
+    'variables': {
+      'application_type': 'mojo',
+      'application_name': 'catalog',
+      'source_manifest': '<(DEPTH)/services/catalog/manifest.json',
+    },
+    'includes': [
+      '../../mojo/public/mojo_application_manifest.gypi',
+    ],
+    'hard_dependency': 1,
+  }, {
+    # GN version: //services/shell/public/cpp/tests
+    'target_name': 'shell_client_lib_unittests',
+    'type': 'executable',
+    'dependencies': [
+      'shell_public',
+      '<(DEPTH)/base/base.gyp:base',
+      '<(DEPTH)/mojo/mojo_edk.gyp:mojo_run_all_unittests',
+      '<(DEPTH)/testing/gtest.gyp:gtest',
+    ],
+    'sources': [
+      'public/cpp/tests/interface_registry_unittest.cc',
+    ],
+  }],
+}