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

remoting/webapp/me2mom/remoting_session.js

Index: remoting/webapp/me2mom/remoting_session.js
===================================================================
--- remoting/webapp/me2mom/remoting_session.js	(revision 86581)
+++ remoting/webapp/me2mom/remoting_session.js	(working copy)
@@ -55,8 +55,8 @@
         var clientjid = xhr.responseText;
 
         remoting.plugin.sendIq = sendIq;
-        remoting.plugin.connectSandboxed(clientjid, remoting.hostjid,
-                                         remoting.accessCode);
+        remoting.plugin.connect(remoting.hostjid, clientjid,
+                                remoting.accessCode);
         // TODO(ajwong): This should just be feedIq();
         window.setTimeout(feedIq, 1000);
       } else {
@@ -123,8 +123,8 @@
     if (remoting.connectMethod == 'sandboxed') {
       registerConnection();
     } else {
-      plugin.connect(remoting.username, remoting.hostjid,
-                     remoting.xmppAuthToken, remoting.accessCode);
+      plugin.connectUnsandboxed(remoting.hostjid, remoting.username,
+                                remoting.xmppAuthToken, remoting.accessCode);
     }
   } else {
     addToDebugLog('ERROR: remoting plugin not loaded');