Revert of Mojo JS bindings: change module loading solution.

mojo/public/js/new_bindings/lib/control_message_handler.js

Index: mojo/public/js/new_bindings/lib/control_message_handler.js
diff --git a/mojo/public/js/new_bindings/lib/control_message_handler.js b/mojo/public/js/new_bindings/lib/control_message_handler.js
index bbd526ea962c677fc31e17704523bfe80b71f1b8..81d9002e0bba86a3022ef3c1cc1c5f85256aa7b1 100644
--- a/mojo/public/js/new_bindings/lib/control_message_handler.js
+++ b/mojo/public/js/new_bindings/lib/control_message_handler.js
@@ -2,88 +2,90 @@
 // 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/lib/control_message_handler", [
+  "mojo/public/js/codec",
+  "mojo/public/interfaces/bindings/interface_control_messages.mojom",
+  "mojo/public/js/validator",
+], function(codec, controlMessages, validator) {
+
+  var Validator = validator.Validator;
 
   function validateControlRequestWithResponse(message) {
-    var messageValidator = new internal.Validator(message);
+    var messageValidator = new Validator(message);
     var error = messageValidator.validateMessageIsRequestExpectingResponse();
-    if (error !== internal.validationError.NONE) {
+    if (error !== validator.validationError.NONE) {
       throw error;
     }
 
-    if (message.getName() != mojo.interface_control2.kRunMessageId) {
+    if (message.getName() != controlMessages.kRunMessageId) {
       throw new Error("Control message name is not kRunMessageId");
     }
 
     // Validate payload.
-    error = mojo.interface_control2.RunMessageParams.validate(messageValidator,
+    error = controlMessages.RunMessageParams.validate(messageValidator,
         message.getHeaderNumBytes());
-    if (error != internal.validationError.NONE) {
+    if (error != validator.validationError.NONE) {
       throw error;
     }
   }
 
   function validateControlRequestWithoutResponse(message) {
-    var messageValidator = new internal.Validator(message);
+    var messageValidator = new Validator(message);
     var error = messageValidator.validateMessageIsRequestWithoutResponse();
-    if (error != internal.validationError.NONE) {
+    if (error != validator.validationError.NONE) {
       throw error;
     }
 
-    if (message.getName() != mojo.interface_control2.kRunOrClosePipeMessageId) {
+    if (message.getName() != controlMessages.kRunOrClosePipeMessageId) {
       throw new Error("Control message name is not kRunOrClosePipeMessageId");
     }
 
     // Validate payload.
-    error = mojo.interface_control2.RunOrClosePipeMessageParams.validate(
+    error = controlMessages.RunOrClosePipeMessageParams.validate(
         messageValidator, message.getHeaderNumBytes());
-    if (error != internal.validationError.NONE) {
+    if (error != validator.validationError.NONE) {
       throw error;
     }
   }
 
   function runOrClosePipe(message, interface_version) {
-    var reader = new internal.MessageReader(message);
+    var reader = new codec.MessageReader(message);
     var runOrClosePipeMessageParams = reader.decodeStruct(
-        mojo.interface_control2.RunOrClosePipeMessageParams);
+        controlMessages.RunOrClosePipeMessageParams);
     return interface_version >=
         runOrClosePipeMessageParams.input.require_version.version;
   }
 
   function run(message, responder, interface_version) {
-    var reader = new internal.MessageReader(message);
+    var reader = new codec.MessageReader(message);
     var runMessageParams =
-        reader.decodeStruct(mojo.interface_control2.RunMessageParams);
+        reader.decodeStruct(controlMessages.RunMessageParams);
     var runOutput = null;
 
     if (runMessageParams.input.query_version) {
-      runOutput = new mojo.interface_control2.RunOutput();
+      runOutput = new controlMessages.RunOutput();
       runOutput.query_version_result = new
-          mojo.interface_control2.QueryVersionResult(
-              {'version': interface_version});
+          controlMessages.QueryVersionResult({'version': interface_version});
     }
 
     var runResponseMessageParams = new
-        mojo.interface_control2.RunResponseMessageParams();
+        controlMessages.RunResponseMessageParams();
     runResponseMessageParams.output = runOutput;
 
-    var messageName = mojo.interface_control2.kRunMessageId;
-    var payloadSize =
-        mojo.interface_control2.RunResponseMessageParams.encodedSize;
+    var messageName = controlMessages.kRunMessageId;
+    var payloadSize = controlMessages.RunResponseMessageParams.encodedSize;
     var requestID = reader.requestID;
-    var builder = new internal.MessageWithRequestIDBuilder(messageName,
-        payloadSize, internal.kMessageIsResponse, requestID);
-    builder.encodeStruct(mojo.interface_control2.RunResponseMessageParams,
+    var builder = new codec.MessageWithRequestIDBuilder(messageName,
+        payloadSize, codec.kMessageIsResponse, requestID);
+    builder.encodeStruct(controlMessages.RunResponseMessageParams,
                          runResponseMessageParams);
     responder.accept(builder.finish());
     return true;
   }
 
-  function isInterfaceControlMessage(message) {
-    return message.getName() == mojo.interface_control2.kRunMessageId ||
-           message.getName() ==
-               mojo.interface_control2.kRunOrClosePipeMessageId;
+  function isControlMessage(message) {
+    return message.getName() == controlMessages.kRunMessageId ||
+           message.getName() == controlMessages.kRunOrClosePipeMessageId;
   }
 
   function ControlMessageHandler(interface_version) {
@@ -101,6 +103,9 @@
     return run(message, responder, this.interface_version);
   };
 
-  internal.ControlMessageHandler = ControlMessageHandler;
-  internal.isInterfaceControlMessage = isInterfaceControlMessage;
-})();
+  var exports = {};
+  exports.ControlMessageHandler = ControlMessageHandler;
+  exports.isControlMessage = isControlMessage;
+
+  return exports;
+});