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

It causes PPAPITest.Transport failure on Vista

BUG=none
TEST=manual


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

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

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

1 files changed, 5 insertions, 3 deletions

diff --git a/remoting/client/appengine/static_files/chromoting_session.js b/remoting/client/appengine/static_files/chromoting_session.js
index 8b96642..b6960df 100644
--- a/remoting/client/appengine/static_files/chromoting_session.js
+++ b/remoting/client/appengine/static_files/chromoting_session.js
@@ -54,7 +54,8 @@ function registerConnection() {
         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 {
@@ -131,8 +132,9 @@ function init() {
     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');