Add in support for connecting with just the OAuth2 token. Default to OAuth2.

remoting/client/appengine/static_files/chromoting_session.js

Index: remoting/client/appengine/static_files/chromoting_session.js
diff --git a/remoting/client/appengine/static_files/chromoting_session.js b/remoting/client/appengine/static_files/chromoting_session.js
index 7c2a8b9fd3da6e84f8527ef036a5b04cc500b46d..64eda76cefa2e3d3869fdf24a0758fb1a91a4407 100644
--- a/remoting/client/appengine/static_files/chromoting_session.js
+++ b/remoting/client/appengine/static_files/chromoting_session.js
@@ -53,7 +53,7 @@ function registerConnection() {
 
         chromoting.plugin.sendIq = sendIq;
         // TODO:(jamiewalch): Pass in the correct nonce.
-        chromoting.plugin.connectSandboxed(clientjid, chromoting.hostjid, '');
+        chromoting.plugin.connectSandboxed(clientjid, chromoting.hostjid);
         // TODO(ajwong): This should just be feedIq();
         window.setTimeout(feedIq, 1000);
       } else {
@@ -65,7 +65,7 @@ function registerConnection() {
   }
   xhr.send('host_jid=' + encodeURIComponent(chromoting.hostjid) +
            '&username=' + encodeURIComponent(chromoting.username) +
-           '&password=' + encodeURIComponent(chromoting.xmppAuthToken));
+           '&password=' + encodeURIComponent(chromoting.talkToken));
   setClientStateMessage("Connecting")
 }
 
@@ -100,7 +100,7 @@ function init() {
   chromoting.username = document.username;
   chromoting.hostname = document.hostname;
   chromoting.hostjid = document.hostjid;
-  chromoting.xmppAuthToken = document.xmppAuthToken;
+  chromoting.talkToken = document.talkToken;
   chromoting.connectMethod = document.connectMethod;
 
   // Only allow https connections to the httpXmppProxy unless we're running in
@@ -132,7 +132,7 @@ function init() {
     } else {
       // TODO:(jamiewalch): Pass in the correct nonce.
       plugin.connect(chromoting.username, chromoting.hostjid,
-                     chromoting.xmppAuthToken, '');
+                     chromoting.talkToken, '');
     }
   } else {
     addToDebugLog('ERROR: chromoting plugin not loaded');