Remove Client= relationship in omnibox.mojom

chrome/browser/resources/omnibox/omnibox.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * Javascript for omnibox.html, served from chrome://omnibox/
  * This is used to debug omnibox ranking.  The user enters some text
  * into a box, submits it, and then sees lots of debug information
  * from the autocompleter that shows what omnibox would do with that
  * input.
  *
  * The simple object defined in this javascript file listens for
  * certain events on omnibox.html, sends (when appropriate) the
  * input text to C++ code to start the omnibox autcomplete controller
  * working, and listens from callbacks from the C++ code saying that
  * results are available.  When results (possibly intermediate ones)
  * are available, the Javascript formats them and displays them.
  */
 define('main', [
+    'mojo/public/js/bindings',
+    'mojo/public/js/core',
     'mojo/public/js/connection',
     'chrome/browser/ui/webui/omnibox/omnibox.mojom',
     'content/public/renderer/service_provider',
-], function(connector, browser, serviceProvider) {
+], function(bindings, core, connection, browser, serviceProvider) {
   'use strict';
 
-  var connection;
   var page;
 
   /**
    * Register our event handlers.
    */
   function initialize() {
     $('omnibox-input-form').addEventListener(
         'submit', startOmniboxQuery, false);
     $('prevent-inline-autocomplete').addEventListener(
         'change', startOmniboxQuery);
@@ skipping 27 matching lines @@
   function startOmniboxQuery(event) {
     // First, clear the results of past calls (if any).
     progressiveAutocompleteResults = [];
     // Then, call chrome with a five-element list:
     // - first element: the value in the text box
     // - second element: the location of the cursor in the text box
     // - third element: the value of prevent-inline-autocomplete
     // - forth element: the value of prefer-keyword
     // - fifth element: the value of page-classification
     cursorPositionUsed = $('input-text').selectionEnd;
+    var pipe = core.createMessagePipe();
+    var stub = connection.bindHandleToStub(pipe.handle0, browser.OmniboxPage);
+    bindings.StubBindings(stub).delegate = page;
+    page.stub_ = stub;
     page.browser_.startOmniboxQuery(
         $('input-text').value,
         cursorPositionUsed,
         $('prevent-inline-autocomplete').checked,
         $('prefer-keyword').checked,
-        parseInt($('page-classification').value));
+        parseInt($('page-classification').value),
+        pipe.handle1);
     // Cancel the submit action.  i.e., don't submit the form.  (We handle
     // display the results solely with Javascript.)
     event.preventDefault();
   }
 
   /**
    * Returns a simple object with information about how to display an
    * autocomplete result data field.
    * @param {string} header the label for the top of the column/table.
    * @param {string} urlLabelForHeader the URL that the header should point
@@ skipping 324 matching lines @@
       var startIndex = showIncompleteResults ? 0 :
           progressiveAutocompleteResults.length - 1;
       for (var i = startIndex; i < progressiveAutocompleteResults.length; i++) {
         addResultToOutput(progressiveAutocompleteResults[i]);
       }
     }
   }
 
   function OmniboxPageImpl(browser) {
     this.browser_ = browser;
-    page = this;
     initialize();
   }
 
   OmniboxPageImpl.prototype =
       Object.create(browser.OmniboxPage.stubClass.prototype);
 
   OmniboxPageImpl.prototype.handleNewAutocompleteResult = function(result) {
     progressiveAutocompleteResults.push(result);
     refresh();
   };
 
   return function() {
-    connection = new connector.Connection(
+    var browserProxy = connection.bindHandleToProxy(
         serviceProvider.connectToService(
             browser.OmniboxUIHandlerMojo.name),
-        OmniboxPageImpl,
-        browser.OmniboxUIHandlerMojo.proxyClass);
+        browser.OmniboxUIHandlerMojo);
+    page = new OmniboxPageImpl(browserProxy);
   };
 });