Revert of Mojo JS bindings: change module loading solution.

mojo/public/js/new_bindings/router.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/router", [
+  "console",
+  "mojo/public/js/codec",
+  "mojo/public/js/core",
+  "mojo/public/js/connector",
+  "mojo/public/js/lib/control_message_handler",
+  "mojo/public/js/validator",
+], function(console, codec, core, connector, controlMessageHandler, validator) {
+
+  var Connector = connector.Connector;
+  var MessageReader = codec.MessageReader;
+  var Validator = validator.Validator;
+  var ControlMessageHandler = controlMessageHandler.ControlMessageHandler;
 
   function Router(handle, interface_version, connectorFactory) {
-    if (!(handle instanceof MojoHandle))
+    if (!core.isHandle(handle))
       throw new Error("Router constructor: Not a handle");
     if (connectorFactory === undefined)
-      connectorFactory = internal.Connector;
+      connectorFactory = Connector;
     this.connector_ = new connectorFactory(handle);
     this.incomingReceiver_ = null;
     this.errorHandler_ = null;
     this.nextRequestID_ = 0;
     this.completers_ = new Map();
     this.payloadValidators_ = [];
     this.testingController_ = null;
 
     if (interface_version !== undefined) {
       this.controlMessageHandler_ = new
-          internal.ControlMessageHandler(interface_version);
+          ControlMessageHandler(interface_version);
     }
 
     this.connector_.setIncomingReceiver({
         accept: this.handleIncomingMessage_.bind(this),
     });
     this.connector_.setErrorHandler({
         onError: this.handleConnectionError_.bind(this),
     });
   }
 
@@ skipping 45 matching lines @@
   Router.prototype.encounteredError = function() {
     return this.connector_.encounteredError();
   };
 
   Router.prototype.enableTestingMode = function() {
     this.testingController_ = new RouterTestingController(this.connector_);
     return this.testingController_;
   };
 
   Router.prototype.handleIncomingMessage_ = function(message) {
-    var noError = internal.validationError.NONE;
-    var messageValidator = new internal.Validator(message);
+    var noError = validator.validationError.NONE;
+    var messageValidator = new Validator(message);
     var err = messageValidator.validateMessageHeader();
     for (var i = 0; err === noError && i < this.payloadValidators_.length; ++i)
       err = this.payloadValidators_[i](messageValidator);
 
     if (err == noError)
       this.handleValidIncomingMessage_(message);
     else
       this.handleInvalidIncomingMessage_(message, err);
   };
 
   Router.prototype.handleValidIncomingMessage_ = function(message) {
     if (this.testingController_)
       return;
 
     if (message.expectsResponse()) {
-      if (internal.isInterfaceControlMessage(message)) {
+      if (controlMessageHandler.isControlMessage(message)) {
         if (this.controlMessageHandler_) {
           this.controlMessageHandler_.acceptWithResponder(message, this);
         } else {
           this.close();
         }
       } else if (this.incomingReceiver_) {
         this.incomingReceiver_.acceptWithResponder(message, this);
       } else {
         // If we receive a request expecting a response when the client is not
         // listening, then we have no choice but to tear down the pipe.
         this.close();
       }
     } else if (message.isResponse()) {
-      var reader = new internal.MessageReader(message);
+      var reader = new MessageReader(message);
       var requestID = reader.requestID;
       var completer = this.completers_.get(requestID);
       if (completer) {
         this.completers_.delete(requestID);
         completer.resolve(message);
       } else {
         console.log("Unexpected response with request ID: " + requestID);
       }
     } else {
-      if (internal.isInterfaceControlMessage(message)) {
+      if (controlMessageHandler.isControlMessage(message)) {
         if (this.controlMessageHandler_) {
           var ok = this.controlMessageHandler_.accept(message);
           if (ok) return;
         }
         this.close();
       } else if (this.incomingReceiver_) {
         this.incomingReceiver_.accept(message);
       }
     }
   };
 
   Router.prototype.handleInvalidIncomingMessage_ = function(message, error) {
     if (!this.testingController_) {
       // TODO(yzshen): Consider notifying the embedder.
       // TODO(yzshen): This should also trigger connection error handler.
       // Consider making accept() return a boolean and let the connector deal
       // with this, as the C++ code does.
-      console.log("Invalid message: " + internal.validationError[error]);
+      console.log("Invalid message: " + validator.validationError[error]);
 
       this.close();
       return;
     }
 
     this.testingController_.onInvalidIncomingMessage(error);
   };
 
   Router.prototype.handleConnectionError_ = function(result) {
     this.completers_.forEach(function(value) {
@@ skipping 20 matching lines @@
       function(callback) {
     this.invalidMessageHandler_ = callback;
   };
 
   RouterTestingController.prototype.onInvalidIncomingMessage =
       function(error) {
     if (this.invalidMessageHandler_)
       this.invalidMessageHandler_(error);
   };
 
-  internal.Router = Router;
-})();
+  var exports = {};
+  exports.Router = Router;
+  return exports;
+});