Changed identity API to use promises instead of callbacks.

remoting/webapp/unittests/apps_v2_migration_unittest.js

 // Copyright 2014 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.
 
 (function() {
 
 'use strict';
 
 var mockIsAppsV2 = null;
 var mockChromeStorage = {};
 
 function pass() {
   ok(true);
   QUnit.start();
 }
 
 function fail() {
   ok(false);
   QUnit.start();
 }
 
 /**
  * @param {string} v1UserName
  * @param {string} v1UserEmail
  * @param {string} currentEmail
  * @param {boolean} v1HasHost
  */
 function setMigrationData_(v1UserName, v1UserEmail, v1HasHosts) {
-  remoting.identity.getUserInfo = function(onDone, onError) {
+  remoting.identity.getUserInfo = function() {
     if (base.isAppsV2()) {
-      onDone('v2user@gmail.com','v2userName');
+      return Promise.resolve(
+          {email: 'v2user@gmail.com', name: 'v2userName'});
     } else {
-      onDone(v1UserEmail, v1UserName);
+      return Promise.resolve(
+          {email: v1UserEmail, name: v1UserName});
     }
   };
+  remoting.identity.getEmail = function() {
+    return remoting.identity.getUserInfo().then(function(info) {
+      return info.email;
+    });
+  };
 
   mockIsAppsV2.returns(false);
   if (v1HasHosts) {
     remoting.AppsV2Migration.saveUserInfo();
   }
 }
 
 module('AppsV2Migration', {
   setup: function() {
     chromeMocks.activate(['storage']);
@@ skipping 48 matching lines @@
   'saveUserInfo() should clear the preferences on v2',
   function() {
     setMigrationData_('v1userName', 'v1user@gmail.com', 'v2user@gmail.com',
                       true);
     mockIsAppsV2.returns(true);
     remoting.AppsV2Migration.saveUserInfo(true);
     remoting.AppsV2Migration.hasHostsInV1App().then(fail, pass);
 });
 
 })();