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

remoting/webapp/me2mom/remoting_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;
 var remoting = chrome.extension.getBackgroundPage().remoting;
 
 // Message id so that we can identify (and ignore) message fade operations for
@@ skipping 37 matching lines @@
   xhr.open('POST', remoting.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;
 
         remoting.plugin.sendIq = sendIq;
-        remoting.plugin.connect(remoting.hostjid, clientjid,
-                                remoting.accessCode);
+        remoting.plugin.connectSandboxed(clientjid, remoting.hostjid,
+                                         remoting.accessCode);
         // 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(remoting.hostjid) +
@@ skipping 46 matching lines @@
   plugin.desktopSizeUpdate = desktopSizeChanged;
   plugin.loginChallenge = loginChallengeCallback;
 
   addToDebugLog('Connect as user ' + remoting.username);
 
   // TODO(garykac): Clean exit if |connect| isn't a function.
   if (typeof plugin.connect === 'function') {
     if (remoting.connectMethod == 'sandboxed') {
       registerConnection();
     } else {
-      plugin.connectUnsandboxed(remoting.hostjid, remoting.username,
-                                remoting.xmppAuthToken, remoting.accessCode);
+      plugin.connect(remoting.username, remoting.hostjid,
+                     remoting.xmppAuthToken, remoting.accessCode);
     }
   } else {
     addToDebugLog('ERROR: remoting plugin not loaded');
     setClientStateMessage('Plugin not loaded');
   }
 
 }
 
 function toggleDebugLog() {
   debugLog = document.getElementById('debug_log');
@@ skipping 172 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);
 }