Changed identity API to use promises instead of callbacks.

remoting/webapp/crd/js/session_connector_impl.js

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * Connect set-up state machine for Me2Me and IT2Me
  */
 
 'use strict';
@@ skipping 329 matching lines @@
 
   var normalizedAccessCode = this.normalizeAccessCode_(accessCode);
   if (normalizedAccessCode.length != kAccessCodeLen) {
     this.onError_(remoting.Error.INVALID_ACCESS_CODE);
     return;
   }
 
   this.hostId_ = normalizedAccessCode.substring(0, kSupportIdLen);
   this.passPhrase_ = normalizedAccessCode;
   this.connectionMode_ = remoting.ClientSession.Mode.IT2ME;
-  remoting.identity.callWithToken(this.connectIT2MeWithToken_.bind(this),
-                                  this.onError_);
+  remoting.identity.getToken().then(
+      this.connectIT2MeWithToken_.bind(this),
+      remoting.Error.handler(this.onError_));
 };
 
 /**
  * Reconnect a closed connection.
  *
  * @return {void} Nothing.
  */
 remoting.SessionConnectorImpl.prototype.reconnect = function() {
   if (this.connectionMode_ == remoting.ClientSession.Mode.IT2ME) {
     console.error('reconnect not supported for IT2Me.');
@@ skipping 44 matching lines @@
  */
 remoting.SessionConnectorImpl.prototype.connectSignaling_ = function() {
   base.dispose(this.signalStrategy_);
   this.signalStrategy_ = null;
 
   /** @type {remoting.SessionConnectorImpl} */
   var that = this;
 
   /** @param {string} token */
   function connectSignalingWithToken(token) {
-    remoting.identity.getUserInfo(
-        connectSignalingWithTokenAndUserInfo.bind(null, token), that.onError_);
+    remoting.identity.getUserInfo().then(
+        connectSignalingWithTokenAndUserInfo.bind(null, token),
+        remoting.Error.handler(that.onError_));
   }
 
   /**
    * Success callback for when the email and fullName have been retrieved
    * for this user.
    * Note that the full name will be null unless the webapp has requested
    * and been granted the userinfo.profile permission.
    *
    * @param {string} token
-   * @param {string} email
-   * @param {string} fullName
+   * @param {{email: string, name: string}} userInfo
    */
-  function connectSignalingWithTokenAndUserInfo(token, email, fullName) {
+  function connectSignalingWithTokenAndUserInfo(token, userInfo) {
     that.signalStrategy_.connect(
-        remoting.settings.XMPP_SERVER_FOR_CLIENT, email, token);
+        remoting.settings.XMPP_SERVER_FOR_CLIENT, userInfo.email, token);
   }
 
   this.signalStrategy_ = remoting.SignalStrategy.create();
   this.signalStrategy_.setStateChangedCallback(
       this.onSignalingState_.bind(this));
 
-  remoting.identity.callWithToken(connectSignalingWithToken, this.onError_);
+  remoting.identity.getToken().then(
+      connectSignalingWithToken,
+      remoting.Error.handler(this.onError_));
 };
 
 /**
  * @private
  * @param {remoting.SignalStrategy.State} state
  */
 remoting.SessionConnectorImpl.prototype.onSignalingState_ = function(state) {
   switch (state) {
     case remoting.SignalStrategy.State.CONNECTED:
       // Proceed only if the connection hasn't been canceled.
@@ skipping 205 matching lines @@
  */
 remoting.DefaultSessionConnectorFactory.prototype.createConnector =
     function(clientContainer, onConnected, onError, onExtensionMessage,
              onConnectionFailed, requiredCapabilities, defaultRemapKeys) {
   return new remoting.SessionConnectorImpl(clientContainer, onConnected,
                                            onError, onExtensionMessage,
                                            onConnectionFailed,
                                            requiredCapabilities,
                                            defaultRemapKeys);
 };