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

It causes PPAPITest.Transport failure on Vista, but sergeyu told me
PPAPITest.Trasnport is flaky and the failure has nothing to do with
the original CL.

BUG=none
TEST=manual


Review URL: http://codereview.chromium.org/7042022

TBR=garykac@chromium.org
Review URL: http://codereview.chromium.org/7069005
Review URL: http://codereview.chromium.org/7068006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86582 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/remoting/webapp/me2mom/remoting_session.js b/remoting/webapp/me2mom/remoting_session.js
index 8a605dd..1a2629e 100644
--- a/remoting/webapp/me2mom/remoting_session.js
+++ b/remoting/webapp/me2mom/remoting_session.js
@@ -55,8 +55,8 @@ function registerConnection() {
         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 @@ function init() {
     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');