Migrate RenderThreadImpl to use ConnectionFilter instead of the ChildThread's InterfaceRegistry to …

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 18 matching lines @@
 
 define(
     'Mojo Helpers',
     [
       'mojo/public/js/core',
       'mojo/public/js/router',
       'mojo/public/js/support',
       'content/public/renderer/connector',
       'content/public/renderer/frame_interfaces',
       'content/public/renderer/interfaces',
-      'content/shell/renderer/layout_test/frame_interface_registry',
-      'content/shell/renderer/layout_test/interface_registry',
     ],
-    (core, router, support, connector, frameInterfaces, interfaces,
-     frameInterfaceRegistry, interfaceRegistry) => {
+    (core, router, support, connector, frameInterfaces, interfaces) => {
       let tearDown = () => {
         connector.clearInterfaceOverridesForTesting();
         frameInterfaces.clearInterfaceOverridesForTesting();
         interfaces.clearInterfaceOverridesForTesting();
       };
       addEventListener('unload', tearDown);
       if (window.add_completion_callback)
         add_completion_callback(tearDown);
 
       return {
           core,
           router,
           support,
           connector,
           frameInterfaces,
-          frameInterfaceRegistry,
           interfaces,
-          interfaceRegistry,
       };
     });
 
 // 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 });
     });
   });
 };