Adding CRC and multi-client support in the Whispernet NaCl wrapper

chrome/browser/resources/whispernet_proxy/js/wrapper.js

Index: chrome/browser/resources/whispernet_proxy/js/wrapper.js
diff --git a/chrome/browser/resources/whispernet_proxy/js/wrapper.js b/chrome/browser/resources/whispernet_proxy/js/wrapper.js
index d5f5701d0a127651f74678cac4e96ec3264d8859..8203b9a758eab32182a6b4ef14de1086f29c4b21 100644
--- a/chrome/browser/resources/whispernet_proxy/js/wrapper.js
+++ b/chrome/browser/resources/whispernet_proxy/js/wrapper.js
@@ -44,6 +44,7 @@ function WhisperEncoder(params, whisperNacl, clientId) {
 
   var msg = {
     type: 'initialize_encoder',
+    client_id: clientId,
     params: params
   };
 
@@ -84,7 +85,7 @@ WhisperEncoder.prototype.encode = function(params) {
  */
 WhisperEncoder.prototype.onNaclMessage_ = function(e) {
   var msg = e.data;
-  if (msg.type == 'encode_token_response') {
+  if (msg.type == 'encode_token_response' && msg.client_id == this.clientId_) {
     chrome.copresencePrivate.sendSamples(this.clientId_,
         { token: bytesToBase64(msg.token), audible: msg.audible }, msg.samples);
   }
@@ -105,22 +106,13 @@ function WhisperDecoder(params, whisperNacl, clientId) {
 
   var msg = {
     type: 'initialize_decoder',
+    client_id: clientId,
     params: params
   };
   this.whisperNacl_.send(msg);
 }
 
 /**
- * Method to request the decoder to wipe its internal buffer.
- */
-WhisperDecoder.prototype.wipeDecoder = function() {
-  var msg = {
-    type: 'wipe_decode_buffer'
-  };
-  this.whisperNacl_.send(msg);
-};
-
-/**
  * Method to request the decoder to process samples.
  * @param {Object} params Process samples parameters object.
  */
@@ -151,7 +143,7 @@ WhisperDecoder.prototype.processSamples = function(params) {
  */
 WhisperDecoder.prototype.onNaclMessage_ = function(e) {
   var msg = e.data;
-  if (msg.type == 'decode_tokens_response') {
+  if (msg.type == 'decode_tokens_response' && msg.client_id == this.clientId_) {
     this.handleCandidates_(msg.tokens, msg.audible);
   }
 };