Revert 86573 - Add separate nonce version of connect calls to ChromotingScriptableObject.

remoting/client/appengine/static_files/chromoting_session.js

 // Copyright (c) 2011 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.
 
 // Maximum numer of lines to record in the debug log.
 // Only the most recent <n> lines are displayed.
 var MAX_DEBUG_LOG_SIZE = 1000;
 
 // Message id so that we can identify (and ignore) message fade operations for
 // old messages.  This starts at 1 and is incremented for each new message.
@@ skipping 36 matching lines @@
   xhr.open("POST", chromoting.httpXmppProxy + '/newConnection', true);
   xhr.withCredentials = true;
   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
   xhr.onreadystatechange = function() {
     if (xhr.readyState == 4) {
       if (xhr.status == 200) {
         addToDebugLog('Receiving Iq: --' + xhr.responseText + '--');
         var clientjid = xhr.responseText;
 
         chromoting.plugin.sendIq = sendIq;
-        chromoting.plugin.connect(chromoting.hostjid, clientjid);
+        // TODO:(jamiewalch): Pass in the correct nonce.
+        chromoting.plugin.connectSandboxed(clientjid, chromoting.hostjid);
         // TODO(ajwong): This should just be feedIq();
         window.setTimeout(feedIq, 1000);
       } else {
         addToDebugLog('FailedToConnect: --' + xhr.responseText +
                       '-- (status=' + xhr.status + ')');
         setClientStateMessage("Failed")
       }
     }
   }
   xhr.send('host_jid=' + encodeURIComponent(chromoting.hostjid) +
@@ skipping 56 matching lines @@
   plugin.loginChallenge = loginChallengeCallback;
 
   addToDebugLog('Connect to ' + chromoting.hostname + ' as user ' +
                 chromoting.username);
 
   // TODO(garykac): Clean exit if |connect| isn't a function.
   if (typeof plugin.connect === 'function') {
     if (chromoting.connectMethod == "sandboxed") {
       registerConnection();
     } else {
-      plugin.connectUnsandboxed(chromoting.hostjid, chromoting.username,
-                                chromoting.talkToken);
+      // TODO:(jamiewalch): Pass in the correct nonce.
+      plugin.connect(chromoting.username, chromoting.hostjid,
+                     chromoting.talkToken, '');
     }
   } else {
     addToDebugLog('ERROR: chromoting plugin not loaded');
     setClientStateMessage('Plugin not loaded');
   }
 
   document.getElementById('title').innerText = chromoting.hostname;
 }
 
 function toggleDebugLog() {
@@ skipping 193 matching lines @@
   setClientStateMessage(
       "Video stats: bandwidth: " + videoBandwidth.toFixed(2) + "Kbps" +
       ", Latency: capture: " + videoCaptureLatency.toFixed(2) + "ms" +
       ", encode: " + videoEncodeLatency.toFixed(2) + "ms" +
       ", decode: " + videoDecodeLatency.toFixed(2) + "ms" +
       ", render: " + videoRenderLatency.toFixed(2) + "ms");
 
   // Update the stats once per second.
   window.setTimeout("updateStatusBarStats()", 1000);
 }