Index: mojo/public/js/lib/control_message_proxy.js |
diff --git a/mojo/public/js/lib/control_message_proxy.js b/mojo/public/js/lib/control_message_proxy.js |
index d6c0734fe1af43be0f802a0e37f5c223101214dd..b6f1d3c83cd710d9fe0ec9837dd6c3310596fc14 100644 |
--- a/mojo/public/js/lib/control_message_proxy.js |
+++ b/mojo/public/js/lib/control_message_proxy.js |
@@ -10,14 +10,18 @@ define("mojo/public/js/lib/control_message_proxy", [ |
var Validator = validator.Validator; |
- function sendRunOrClosePipeMessage(receiver, runOrClosePipeMessageParams) { |
+ function constructRunOrClosePipeMessage(runOrClosePipeInput) { |
+ var runOrClosePipeMessageParams = new |
+ controlMessages.RunOrClosePipeMessageParams(); |
+ runOrClosePipeMessageParams.input = runOrClosePipeInput; |
+ |
var messageName = controlMessages.kRunOrClosePipeMessageId; |
var payloadSize = controlMessages.RunOrClosePipeMessageParams.encodedSize; |
var builder = new codec.MessageBuilder(messageName, payloadSize); |
builder.encodeStruct(controlMessages.RunOrClosePipeMessageParams, |
runOrClosePipeMessageParams); |
var message = builder.finish(); |
- receiver.accept(message); |
+ return message; |
} |
function validateControlResponse(message) { |
@@ -71,7 +75,7 @@ define("mojo/public/js/lib/control_message_proxy", [ |
} |
function ControlMessageProxy(receiver) { |
- this.receiver = receiver; |
+ this.receiver_ = receiver; |
} |
ControlMessageProxy.prototype.queryVersion = function() { |
@@ -79,20 +83,18 @@ define("mojo/public/js/lib/control_message_proxy", [ |
runMessageParams.input = new controlMessages.RunInput(); |
runMessageParams.input.query_version = new controlMessages.QueryVersion(); |
- return sendRunMessage(this.receiver, runMessageParams).then(function( |
+ return sendRunMessage(this.receiver_, runMessageParams).then(function( |
runResponseMessageParams) { |
return runResponseMessageParams.output.query_version_result.version; |
}); |
}; |
ControlMessageProxy.prototype.requireVersion = function(version) { |
- var runOrClosePipeMessageParams = new |
- controlMessages.RunOrClosePipeMessageParams(); |
- runOrClosePipeMessageParams.input = new |
- controlMessages.RunOrClosePipeInput(); |
- runOrClosePipeMessageParams.input.require_version = new |
- controlMessages.RequireVersion({'version': version}); |
- sendRunOrClosePipeMessage(this.receiver, runOrClosePipeMessageParams); |
+ var runOrClosePipeInput = new controlMessages.RunOrClosePipeInput(); |
+ runOrClosePipeInput.require_version = new controlMessages.RequireVersion({ |
+ 'version': version}); |
+ var message = constructRunOrClosePipeMessage(runOrClosePipeInput); |
+ this.receiver_.accept(message); |
}; |
var exports = {}; |