Revert of Mojo JS bindings: change module loading solution.

mojo/public/js/new_bindings/bindings.js

 // Copyright 2014 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.
 
-(function() {
-  var internal = mojoBindings.internal;
+define("mojo/public/js/bindings", [
+  "mojo/public/js/core",
+  "mojo/public/js/lib/control_message_proxy",
+  "mojo/public/js/interface_types",
+  "mojo/public/js/router",
+], function(core, controlMessageProxy, types, router) {
+
   // ---------------------------------------------------------------------------
 
   function makeRequest(interfacePtr) {
-    var pipe = Mojo.createMessagePipe();
-    interfacePtr.ptr.bind(new mojoBindings.InterfacePtrInfo(pipe.handle0, 0));
-    return new mojoBindings.InterfaceRequest(pipe.handle1);
+    var pipe = core.createMessagePipe();
+    interfacePtr.ptr.bind(new types.InterfacePtrInfo(pipe.handle0, 0));
+    return new types.InterfaceRequest(pipe.handle1);
   }
 
   // ---------------------------------------------------------------------------
 
   // Operations used to setup/configure an interface pointer. Exposed as the
   // |ptr| field of generated interface pointer classes.
   // |ptrInfoOrHandle| could be omitted and passed into bind() later.
   function InterfacePtrController(interfaceType, ptrInfoOrHandle) {
     this.version = 0;
 
     this.interfaceType_ = interfaceType;
     this.router_ = null;
     this.proxy_ = null;
 
     // |router_| is lazily initialized. |handle_| is valid between bind() and
     // the initialization of |router_|.
     this.handle_ = null;
     this.controlMessageProxy_ = null;
 
     if (ptrInfoOrHandle)
       this.bind(ptrInfoOrHandle);
   }
 
   InterfacePtrController.prototype.bind = function(ptrInfoOrHandle) {
     this.reset();
 
-    if (ptrInfoOrHandle instanceof mojoBindings.InterfacePtrInfo) {
+    if (ptrInfoOrHandle instanceof types.InterfacePtrInfo) {
       this.version = ptrInfoOrHandle.version;
       this.handle_ = ptrInfoOrHandle.handle;
     } else {
       this.handle_ = ptrInfoOrHandle;
     }
   };
 
   InterfacePtrController.prototype.isBound = function() {
     return this.router_ !== null || this.handle_ !== null;
   };
 
   // Although users could just discard the object, reset() closes the pipe
   // immediately.
   InterfacePtrController.prototype.reset = function() {
     this.version = 0;
     if (this.router_) {
       this.router_.close();
       this.router_ = null;
 
       this.proxy_ = null;
     }
     if (this.handle_) {
-      this.handle_.close();
+      core.close(this.handle_);
       this.handle_ = null;
     }
   };
 
   InterfacePtrController.prototype.setConnectionErrorHandler
       = function(callback) {
     if (!this.isBound())
       throw new Error("Cannot set connection error handler if not bound.");
 
     this.configureProxyIfNecessary_();
     this.router_.setErrorHandler(callback);
   };
 
   InterfacePtrController.prototype.passInterface = function() {
     var result;
     if (this.router_) {
       // TODO(yzshen): Fix Router interface to support extracting handle.
-      result = new mojoBindings.InterfacePtrInfo(
+      result = new types.InterfacePtrInfo(
           this.router_.connector_.handle_, this.version);
       this.router_.connector_.handle_ = null;
     } else {
       // This also handles the case when this object is not bound.
-      result = new mojoBindings.InterfacePtrInfo(this.handle_, this.version);
+      result = new types.InterfacePtrInfo(this.handle_, this.version);
       this.handle_ = null;
     }
 
     this.reset();
     return result;
   };
 
   InterfacePtrController.prototype.getProxy = function() {
     this.configureProxyIfNecessary_();
     return this.proxy_;
   };
 
   InterfacePtrController.prototype.enableTestingMode = function() {
     this.configureProxyIfNecessary_();
     return this.router_.enableTestingMode();
   };
 
   InterfacePtrController.prototype.configureProxyIfNecessary_ = function() {
     if (!this.handle_)
       return;
 
-    this.router_ = new internal.Router(this.handle_);
+    this.router_ = new router.Router(this.handle_);
     this.handle_ = null;
     this.router_ .setPayloadValidators([this.interfaceType_.validateResponse]);
 
-    this.controlMessageProxy_ = new internal.ControlMessageProxy(this.router_);
+    this.controlMessageProxy_ = new
+        controlMessageProxy.ControlMessageProxy(this.router_);
 
     this.proxy_ = new this.interfaceType_.proxyClass(this.router_);
   };
 
   InterfacePtrController.prototype.queryVersion = function() {
     function onQueryVersion(version) {
       this.version = version;
       return version;
     }
 
@@ skipping 44 matching lines @@
   Binding.prototype.createInterfacePtrAndBind = function() {
     var ptr = new this.interfaceType_.ptrClass();
     // TODO(yzshen): Set the version of the interface pointer.
     this.bind(makeRequest(ptr));
     return ptr;
   }
 
   Binding.prototype.bind = function(requestOrHandle) {
     this.close();
 
-    var handle = requestOrHandle instanceof mojoBindings.InterfaceRequest ?
+    var handle = requestOrHandle instanceof types.InterfaceRequest ?
         requestOrHandle.handle : requestOrHandle;
-    if (!(handle instanceof MojoHandle))
+    if (!core.isHandle(handle))
       return;
 
     this.stub_ = new this.interfaceType_.stubClass(this.impl_);
-    this.router_ = new internal.Router(handle, this.interfaceType_.kVersion);
+    this.router_ = new router.Router(handle, this.interfaceType_.kVersion);
     this.router_.setIncomingReceiver(this.stub_);
     this.router_ .setPayloadValidators([this.interfaceType_.validateRequest]);
   };
 
   Binding.prototype.close = function() {
     if (!this.isBound())
       return;
 
     this.router_.close();
     this.router_ = null;
     this.stub_ = null;
   };
 
   Binding.prototype.setConnectionErrorHandler
       = function(callback) {
     if (!this.isBound())
       throw new Error("Cannot set connection error handler if not bound.");
     this.router_.setErrorHandler(callback);
   };
 
   Binding.prototype.unbind = function() {
     if (!this.isBound())
-      return new mojoBindings.InterfaceRequest(null);
+      return new types.InterfaceRequest(null);
 
-    var result = new mojoBindings.InterfaceRequest(
-        this.router_.connector_.handle_);
+    var result = new types.InterfaceRequest(this.router_.connector_.handle_);
     this.router_.connector_.handle_ = null;
     this.close();
     return result;
   };
 
   Binding.prototype.enableTestingMode = function() {
     return this.router_.enableTestingMode();
   };
 
   // ---------------------------------------------------------------------------
@@ skipping 42 matching lines @@
     this.errorHandler_ = callback;
   };
 
   BindingSet.prototype.onConnectionError = function(bindingId) {
     this.bindings_.delete(bindingId);
 
     if (this.errorHandler_)
       this.errorHandler_();
   };
 
+  var exports = {};
+  exports.InterfacePtrInfo = types.InterfacePtrInfo;
+  exports.InterfaceRequest = types.InterfaceRequest;
+  exports.makeRequest = makeRequest;
+  exports.InterfacePtrController = InterfacePtrController;
+  exports.Binding = Binding;
+  exports.BindingSet = BindingSet;
 
-  mojoBindings.makeRequest = makeRequest;
-  mojoBindings.Binding = Binding;
-  mojoBindings.BindingSet = BindingSet;
-  mojoBindings.InterfacePtrController = InterfacePtrController;
-})();
+  return exports;
+});