Make the process-wide ServiceRegistry available to JS.

BUG=597465

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

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

8 files changed, 8 insertions, 8 deletions

diff --git a/extensions/renderer/api_test_base.cc b/extensions/renderer/api_test_base.cc
index 79f95e2..81ec07f 100644
--- a/extensions/renderer/api_test_base.cc
+++ b/extensions/renderer/api_test_base.cc
@@ -165,7 +165,7 @@ void ApiTestEnvironment::RegisterModules() {
   service_provider_ = service_provider.get();
   gin::ModuleRegistry::From(env()->context()->v8_context())
       ->AddBuiltinModule(env()->isolate(),
-                         "content/public/renderer/service_provider",
+                         "content/public/renderer/frame_service_registry",
                          service_provider.ToV8());
 }
 
diff --git a/extensions/renderer/resources/keep_alive.js b/extensions/renderer/resources/keep_alive.js
index aa5f6a0..5269c30 100644
--- a/extensions/renderer/resources/keep_alive.js
+++ b/extensions/renderer/resources/keep_alive.js
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 define('keep_alive', [
-    'content/public/renderer/service_provider',
+    'content/public/renderer/frame_service_registry',
     'extensions/common/mojo/keep_alive.mojom',
     'mojo/public/js/core',
 ], function(serviceProvider, mojom, core) {
diff --git a/extensions/renderer/resources/media_router_bindings.js b/extensions/renderer/resources/media_router_bindings.js
index e7f32d8..85685c6 100644
--- a/extensions/renderer/resources/media_router_bindings.js
+++ b/extensions/renderer/resources/media_router_bindings.js
@@ -7,7 +7,7 @@ var mediaRouter;
 define('media_router_bindings', [
     'mojo/public/js/bindings',
     'mojo/public/js/core',
-    'content/public/renderer/service_provider',
+    'content/public/renderer/frame_service_registry',
     'chrome/browser/media/router/media_router.mojom',
     'extensions/common/mojo/keep_alive.mojom',
     'mojo/public/js/connection',
diff --git a/extensions/renderer/resources/mime_handler_private_custom_bindings.js b/extensions/renderer/resources/mime_handler_private_custom_bindings.js
index bd7eddd..8e9eb20 100644
--- a/extensions/renderer/resources/mime_handler_private_custom_bindings.js
+++ b/extensions/renderer/resources/mime_handler_private_custom_bindings.js
@@ -13,7 +13,7 @@ var NO_STREAM_ERROR =
 var STREAM_ABORTED_ERROR = 'Stream has been aborted.';
 
 var servicePromise = Promise.all([
-    requireAsync('content/public/renderer/service_provider'),
+    requireAsync('content/public/renderer/frame_service_registry'),
     requireAsync('extensions/common/api/mime_handler.mojom'),
     requireAsync('mojo/public/js/router'),
 ]).then(function(modules) {
diff --git a/extensions/renderer/resources/serial_service.js b/extensions/renderer/resources/serial_service.js
index 015a742..26b990b 100644
--- a/extensions/renderer/resources/serial_service.js
+++ b/extensions/renderer/resources/serial_service.js
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 define('serial_service', [
-    'content/public/renderer/service_provider',
+    'content/public/renderer/frame_service_registry',
     'data_receiver',
     'data_sender',
     'device/serial/serial.mojom',
diff --git a/extensions/renderer/resources/stash_client.js b/extensions/renderer/resources/stash_client.js
index 56f289f..240a676 100644
--- a/extensions/renderer/resources/stash_client.js
+++ b/extensions/renderer/resources/stash_client.js
@@ -4,7 +4,7 @@
 
 define('stash_client', [
     'async_waiter',
-    'content/public/renderer/service_provider',
+    'content/public/renderer/frame_service_registry',
     'extensions/common/mojo/stash.mojom',
     'mojo/public/js/buffer',
     'mojo/public/js/codec',
diff --git a/extensions/test/data/api_test_base_unittest.js b/extensions/test/data/api_test_base_unittest.js
index 10c4792..77a9cb2 100644
--- a/extensions/test/data/api_test_base_unittest.js
+++ b/extensions/test/data/api_test_base_unittest.js
@@ -38,7 +38,7 @@ unittestBindings.exportTests([
     Promise.all([
       requireAsync('mojo/public/js/connection'),
       requireAsync('mojo/public/js/core'),
-      requireAsync('content/public/renderer/service_provider'),
+      requireAsync('content/public/renderer/frame_service_registry'),
     ]).then(test.callback(function(modules) {
       var connection = modules[0];
       var core = modules[1];
diff --git a/extensions/test/data/data_sender_unittest.js b/extensions/test/data/data_sender_unittest.js
index 0b6a5cf..48c1cec 100644
--- a/extensions/test/data/data_sender_unittest.js
+++ b/extensions/test/data/data_sender_unittest.js
@@ -24,7 +24,7 @@ function generateData(size, pattern) {
 // Returns a promise to a newly created DataSender.
 function createSender() {
   return Promise.all([
-    requireAsync('content/public/renderer/service_provider'),
+    requireAsync('content/public/renderer/frame_service_registry'),
     requireAsync('data_sender'),
     requireAsync('device/serial/data_stream.mojom'),
   ]).then(function(modules) {