Make the process-wide ServiceRegistry available to JS.

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

 /*
  * mojo-helpers contains extensions to testharness.js useful for consuming
  * and mocking Mojo services directly within test code.
  */
 'use strict';
 
 // Fix up the global window.define, since all baked-in Mojo modules expect to
 // find it there. This define() also returns a promise to the module.
 let define = (function(){
   let moduleCache = new Map();
@@ skipping 13 matching lines @@
       moduleCache.set(name, promise);
     }
     return promise;
   }
 })();
 
 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,
   };
 });
 
 // Returns a promise to an object that exposes common Mojo module interfaces.
 // Additional modules to load can be specified in the |modules| parameter. The
 // result will contain them, in the same order, in the |modules| field.
 function loadMojoModules(name, modules = []) {
   return define('Mojo modules: ' + name,
                 [ 'Mojo Helpers' ].concat(modules),
                 (mojo, ...rest) => {
@@ skipping 22 matching lines @@
       let buffer, handles;
       ({ result, buffer, handles } = mojo.core.readMessage(pipe, 0));
       if (result !== mojo.core.RESULT_OK) {
         reject(result);
         return;
       }
       resolve({ buffer, handles });
     });
   });
 };