Add separate nonce version of connect calls to ChromotingScriptableObject.

BUG=none
TEST=manual


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

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

1 files changed, 3 insertions, 5 deletions

diff --git a/remoting/client/appengine/static_files/chromoting_session.js b/remoting/client/appengine/static_files/chromoting_session.js
index b6960df..8b96642 100644
--- a/remoting/client/appengine/static_files/chromoting_session.js
+++ b/remoting/client/appengine/static_files/chromoting_session.js
@@ -54,8 +54,7 @@ function registerConnection() {
         var clientjid = xhr.responseText;
 
         chromoting.plugin.sendIq = sendIq;
-        // TODO:(jamiewalch): Pass in the correct nonce.
-        chromoting.plugin.connectSandboxed(clientjid, chromoting.hostjid);
+        chromoting.plugin.connect(chromoting.hostjid, clientjid);
         // TODO(ajwong): This should just be feedIq();
         window.setTimeout(feedIq, 1000);
       } else {
@@ -132,9 +131,8 @@ function init() {
     if (chromoting.connectMethod == "sandboxed") {
       registerConnection();
     } else {
-      // TODO:(jamiewalch): Pass in the correct nonce.
-      plugin.connect(chromoting.username, chromoting.hostjid,
-                     chromoting.talkToken, '');
+      plugin.connectUnsandboxed(chromoting.hostjid, chromoting.username,
+                                chromoting.talkToken);
     }
   } else {
     addToDebugLog('ERROR: chromoting plugin not loaded');