Mojo: split up service_provider.mojom

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286725 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 23 insertions, 23 deletions

diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
index 3052fd4..cefe814 100644
--- a/content/app/BUILD.gn
+++ b/content/app/BUILD.gn
@@ -52,7 +52,7 @@ if (is_ios) {
 } else {
   content_app_deps += [
     "//mojo/environment:chromium",
-    "//mojo/public/interfaces/service_provider",
+    "//mojo/public/interfaces/application",
     "//mojo/service_manager",
     "//mojo/system",
   ]
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index d08e80d..76fb114 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -92,7 +92,7 @@ source_set("browser") {
       "//cc",
       "//cc/surfaces",
       "//mojo/public/cpp/bindings",
-      "//mojo/public/interfaces/service_provider",
+      "//mojo/public/interfaces/application",
       "//mojo/public/js/bindings",
       "//net:http_server",
       "//third_party/icu",
diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
index 873c13b..e77fcd8 100644
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -18,7 +18,7 @@ source_set("child") {
     "//base",
     "//components/tracing",
     "//mojo/environment:chromium",
-    "//mojo/public/interfaces/service_provider",
+    "//mojo/public/interfaces/application",
     "//skia",
     "//third_party/icu",
     "//ui/base",
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 038d758..0e44b2c 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -60,7 +60,7 @@ source_set("common") {
       "//gpu/skia_bindings",
       "//media",
       "//media:shared_memory_support",
-      "//mojo/public/interfaces/service_provider",
+      "//mojo/public/interfaces/application",
       "//third_party/WebKit/public:blink",
       "//ui/gl",
       "//webkit/browser:storage",
@@ -276,6 +276,6 @@ mojom("mojo_bindings") {
   ]
 
   deps = [
-    "//mojo/public/interfaces/service_provider:service_provider",
+    "//mojo/public/interfaces/application:application",
   ]
 }
diff --git a/content/common/mojo/service_registry_impl.h b/content/common/mojo/service_registry_impl.h
index d3ca173..fe78364 100644
--- a/content/common/mojo/service_registry_impl.h
+++ b/content/common/mojo/service_registry_impl.h
@@ -15,7 +15,7 @@
 #include "content/public/common/service_registry.h"
 #include "mojo/public/cpp/bindings/interface_impl.h"
 #include "mojo/public/cpp/system/core.h"
-#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
+#include "mojo/public/interfaces/application/service_provider.mojom.h"
 
 namespace content {
 
diff --git a/content/common/render_frame_setup.mojom b/content/common/render_frame_setup.mojom
index 7d108e5..dfe89ce 100644
--- a/content/common/render_frame_setup.mojom
+++ b/content/common/render_frame_setup.mojom
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import "../../mojo/public/interfaces/service_provider/service_provider.mojom"
+import "../../mojo/public/interfaces/application/service_provider.mojom"
 
 module content {
 
diff --git a/content/content_app.gypi b/content/content_app.gypi
index deeea45..24ddad5 100644
--- a/content/content_app.gypi
+++ b/content/content_app.gypi
@@ -66,9 +66,9 @@
       ],
     }, {  # OS!="ios"
       'dependencies': [
+        '../mojo/mojo_base.gyp:mojo_application_bindings',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
         '../mojo/mojo_base.gyp:mojo_system_impl',
-        '../mojo/mojo_base.gyp:mojo_service_provider_bindings',
         '../mojo/mojo.gyp:mojo_service_manager',
      ],
     }],
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 688562d..8adb26e 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1567,7 +1567,7 @@
         'content_common_mojo_bindings',
         '../cc/cc.gyp:cc',
         '../cc/cc.gyp:cc_surfaces',
-        '../mojo/mojo_base.gyp:mojo_service_provider_bindings',
+        '../mojo/mojo_base.gyp:mojo_application_bindings',
         '../mojo/mojo_base.gyp:mojo_cpp_bindings',
         '../mojo/mojo_base.gyp:mojo_js_bindings',
         '../net/net.gyp:http_server',
diff --git a/content/content_child.gypi b/content/content_child.gypi
index 30d2c2d..4e5784f 100644
--- a/content/content_child.gypi
+++ b/content/content_child.gypi
@@ -6,8 +6,8 @@
   'dependencies': [
     '../base/base.gyp:base',
     '../components/tracing.gyp:tracing',
+    '../mojo/mojo_base.gyp:mojo_application_bindings',
     '../mojo/mojo_base.gyp:mojo_environment_chromium',
-    '../mojo/mojo_base.gyp:mojo_service_provider_bindings',
     '../skia/skia.gyp:skia',
     '../ui/base/ui_base.gyp:ui_base',
     '../ui/gfx/gfx.gyp:gfx',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 844f149..e46690c 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -553,7 +553,7 @@
         '../ipc/ipc.gyp:ipc',
         '../media/media.gyp:media',
         '../media/media.gyp:shared_memory_support',
-        '../mojo/mojo_base.gyp:mojo_service_provider_bindings',
+        '../mojo/mojo_base.gyp:mojo_application_bindings',
         '../mojo/mojo_base.gyp:mojo_cpp_bindings',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
         '../mojo/mojo_base.gyp:mojo_system_impl',
diff --git a/content/content_common_mojo_bindings.gypi b/content/content_common_mojo_bindings.gypi
index 35c5264..85b784d 100644
--- a/content/content_common_mojo_bindings.gypi
+++ b/content/content_common_mojo_bindings.gypi
@@ -8,18 +8,18 @@
       'target_name': 'content_common_mojo_bindings',
       'type': 'static_library',
       'dependencies': [
+        '../mojo/mojo_base.gyp:mojo_application_bindings',
         '../mojo/mojo_base.gyp:mojo_cpp_bindings',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_base.gyp:mojo_service_provider_bindings'
       ],
       'sources': [
         'common/render_frame_setup.mojom',
       ],
       'includes': [ '../mojo/public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
+        '../mojo/mojo_base.gyp:mojo_application_bindings',
         '../mojo/mojo_base.gyp:mojo_cpp_bindings',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_base.gyp:mojo_service_provider_bindings'
       ],
     },
   ],
diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi
index bbfd152..df99270 100644
--- a/content/content_gpu.gypi
+++ b/content/content_gpu.gypi
@@ -5,7 +5,7 @@
 {
   'dependencies': [
     '../base/base.gyp:base',
-    '../mojo/mojo_base.gyp:mojo_service_provider_bindings',
+    '../mojo/mojo_base.gyp:mojo_application_bindings',
     '../skia/skia.gyp:skia',
     '../ui/gl/gl.gyp:gl',
   ],
diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi
index a73d42c..aad04bd 100644
--- a/content/content_plugin.gypi
+++ b/content/content_plugin.gypi
@@ -6,7 +6,7 @@
   'conditions': [
     ['enable_plugins==1 and OS!="linux"', {
       'dependencies': [
-        '../mojo/mojo_base.gyp:mojo_service_provider_bindings',
+        '../mojo/mojo_base.gyp:mojo_application_bindings',
         '../skia/skia.gyp:skia',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../third_party/npapi/npapi.gyp:npapi',
diff --git a/content/content_ppapi_plugin.gypi b/content/content_ppapi_plugin.gypi
index 5c43f6b..2376b80 100644
--- a/content/content_ppapi_plugin.gypi
+++ b/content/content_ppapi_plugin.gypi
@@ -7,7 +7,7 @@
     ['enable_plugins==1', {
       'dependencies': [
         '../base/base.gyp:base',
-        '../mojo/mojo_base.gyp:mojo_service_provider_bindings',
+        '../mojo/mojo_base.gyp:mojo_application_bindings',
         '../ppapi/ppapi_internal.gyp:ppapi_ipc',
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/gfx/gfx.gyp:gfx',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index be2c867..f0da36b 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -12,9 +12,9 @@
     '../gpu/gpu.gyp:gpu',
     '../jingle/jingle.gyp:jingle_glue',
     '../media/media.gyp:media',
+    '../mojo/mojo_base.gyp:mojo_application_bindings',
     '../mojo/mojo_base.gyp:mojo_environment_chromium',
     '../mojo/mojo_base.gyp:mojo_js_bindings_lib',
-    '../mojo/mojo_base.gyp:mojo_service_provider_bindings',
     '../net/net.gyp:net',
     '../skia/skia.gyp:skia',
     '../third_party/WebKit/public/blink.gyp:blink',
diff --git a/content/content_utility.gypi b/content/content_utility.gypi
index b1a04ff..aee298d 100644
--- a/content/content_utility.gypi
+++ b/content/content_utility.gypi
@@ -6,7 +6,7 @@
   'dependencies': [
     '../base/base.gyp:base',
     '../courgette/courgette.gyp:courgette_lib',
-    '../mojo/mojo_base.gyp:mojo_service_provider_bindings',
+    '../mojo/mojo_base.gyp:mojo_application_bindings',
   ],
   'sources': [
     'public/utility/content_utility_client.cc',
diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
index d95552d..02f0de6 100644
--- a/content/gpu/BUILD.gn
+++ b/content/gpu/BUILD.gn
@@ -27,7 +27,7 @@ source_set("gpu") {
   deps = [
     "//base",
     "//content:export",
-    "//mojo/public/interfaces/service_provider",
+    "//mojo/public/interfaces/application",
     "//skia",
     "//ui/gl",
   ]
diff --git a/content/plugin/BUILD.gn b/content/plugin/BUILD.gn
index a5e6481..80c42958 100644
--- a/content/plugin/BUILD.gn
+++ b/content/plugin/BUILD.gn
@@ -29,7 +29,7 @@ if (enable_plugins && !is_linux) {
 
     deps = [
       "//content:export",
-      "//mojo/public/interfaces/service_provider",
+      "//mojo/public/interfaces/application",
       "//skia",
       "//third_party/npapi",
       "//third_party/WebKit/public:blink",
diff --git a/content/ppapi_plugin/BUILD.gn b/content/ppapi_plugin/BUILD.gn
index b27ae34..55c5d3b 100644
--- a/content/ppapi_plugin/BUILD.gn
+++ b/content/ppapi_plugin/BUILD.gn
@@ -21,7 +21,7 @@ source_set("ppapi_plugin") {
   deps = [
     "//base",
     "//content:export",
-    "//mojo/public/interfaces/service_provider",
+    "//mojo/public/interfaces/application",
     "//ppapi:ppapi_ipc",
     "//skia",
     "//third_party/icu",
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index a357442..6dacd5a 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -31,7 +31,7 @@ source_set("renderer") {
     "//mojo/bindings/js",
     "//mojo/environment:chromium",
     "//mojo/public/js/bindings",
-    "//mojo/public/interfaces/service_provider",
+    "//mojo/public/interfaces/application",
     "//net",
     "//skia",
     "//third_party/icu",
diff --git a/content/utility/BUILD.gn b/content/utility/BUILD.gn
index 1cc0ead..06d06bb 100644
--- a/content/utility/BUILD.gn
+++ b/content/utility/BUILD.gn
@@ -17,7 +17,7 @@ source_set("utility") {
     "//base",
     "//content:export",
     "//courgette:courgette_lib",
-    "//mojo/public/interfaces/service_provider",
+    "//mojo/public/interfaces/application",
     "//third_party/WebKit/public:blink_headers",
   ]
 }