Make the process-wide ServiceRegistry available to JS.

third_party/WebKit/LayoutTests/resources/mojo-helpers.js

Index: third_party/WebKit/LayoutTests/resources/mojo-helpers.js
diff --git a/third_party/WebKit/LayoutTests/resources/mojo-helpers.js b/third_party/WebKit/LayoutTests/resources/mojo-helpers.js
index 6e3f7cd9100c8c6a8821b1bd7dacce754a63333a..db7a6264bf3d0f6219356e6ff2a3b89c06e6518f 100644
--- a/third_party/WebKit/LayoutTests/resources/mojo-helpers.js
+++ b/third_party/WebKit/LayoutTests/resources/mojo-helpers.js
@@ -31,20 +31,20 @@ define('Mojo Helpers', [
     'mojo/public/js/core',
     'mojo/public/js/router',
     'mojo/public/js/support',
-    'content/public/renderer/service_provider'
-], (core, router, support, serviceProvider) => {
+    'content/public/renderer/frame_service_registry',
+    'content/public/renderer/service_registry',
+], (core, router, support, frameServiceRegistry, serviceRegistry) => {
   add_completion_callback(() => {
-    serviceProvider.clearServiceOverridesForTesting();
+    frameServiceRegistry.clearServiceOverridesForTesting();
+    serviceRegistry.clearServiceOverridesForTesting();
   });
 
   return {
-    core: core,
-    router: router,
-    support: support,
-
-    // |serviceProvider| is a bit of a misnomer. It should probably be
-    // called |serviceRegistry|, so let's call it that here.
-    serviceRegistry: serviceProvider,
+    core,
+    router,
+    support,
+    frameServiceRegistry,
+    serviceRegistry,
   };
 });