Make Chromoting browser tests pass again

remoting/webapp/browser_test/it2me_browser_test.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.
 
 /**
  * @fileoverview
- * @suppress {checkTypes}
  * Browser test for the scenario below:
  * 1. Generates an access code.
  * 2. Launches another chromoting app instance.
  * 3. Connects with the generated access code.
  * 4. Verifies that the session is connected.
  */
 
 'use strict';
 
 /** @constructor */
 browserTest.ConnectIt2Me = function() {};
 
 /**
  * @param {{pin: string, accessCode: string}} data
  */
 browserTest.ConnectIt2Me.prototype.run = function(data) {
   browserTest.expect(typeof data.accessCode == 'string',
                      'The access code should be an non-empty string');
   browserTest.clickOnControl('get-started-it2me');
   var that = this;
   browserTest.ConnectIt2Me.clickOnAccessButton().then(function() {
     return that.enterAccessCode_(data.accessCode);
   }).then(function() {
     return browserTest.disconnect();
   }).then(function() {
     browserTest.pass();
-  /** @param {*} reason */
-  }, function(reason) {
-    browserTest.fail(reason);
+  }, function(/** * */reason) {
+    browserTest.fail(/** @type {Error} */(reason));
   });
 };
 
 /** @return {Promise} */
 browserTest.ConnectIt2Me.clickOnAccessButton = function() {
   browserTest.clickOnControl('access-mode-button');
   return browserTest.onUIMode(remoting.AppMode.CLIENT_UNCONNECTED);
 };
 
 /**
@@ skipping 17 matching lines @@
   browserTest.expect(typeof data.accessCode == 'string',
                      'The access code should be an non-empty string');
   browserTest.ConnectIt2Me.clickOnAccessButton().then(function() {
     document.getElementById('access-code-entry').value = data.accessCode;
     browserTest.clickOnControl('connect-button');
     return browserTest.expectConnectionError(
         remoting.DesktopConnectedView.Mode.IT2ME,
         remoting.Error.INVALID_ACCESS_CODE);
   }).then(function() {
     browserTest.pass();
-  }, function(reason) {
-    browserTest.fail(reason);
+  }, function(/** * */reason) {
+    browserTest.fail(/** @type {Error} */(reason));
   });
 };
 
 /** @constructor */
 browserTest.GetAccessCode = function() {};
 
 browserTest.GetAccessCode.prototype.run = function() {
   browserTest.clickOnControl('get-started-it2me');
-  this.onUserInfoReady_().then(function() {
+
+  // Wait for the email address of the local user to become available.  The
+  // email address is required in an It2Me connection for domain policy
+  // enforcement. TODO:(kelvinp) Fix this awkward behavior in the production
+  // code so that this  hack is no longer required.
+  remoting.identity.getUserInfo().then(function(info) {
     browserTest.clickOnControl('share-button');
   }).then(function(){
     return browserTest.onUIMode(remoting.AppMode.HOST_WAITING_FOR_CONNECTION);
   }).then(function() {
     var accessCode = document.getElementById('access-code-display').innerText;
     var numericAccessCode = parseFloat(accessCode);
     browserTest.expect(accessCode.length === 12,
                        "The access code should be 12 digits long.");
     browserTest.expect(
         Number.isInteger(numericAccessCode) && numericAccessCode > 0,
         "The access code should be a positive integer.");
-    browserTest.pass(accessCode);
-  },function(reason) {
-    browserTest.fail(reason);
+    browserTest.pass();
+  }, function(/** * */reason) {
+    browserTest.fail(/** @type {Error} */(reason));
   });
 };
-
-/**
- * Wait for the email address of the local user to become available.  The email
- * address is required in an It2Me connection for domain policy enforcement.
- * TODO:(kelvinp) Fix this awkward behavior in the production code so that this
- * hack is no longer required.
- *
- * @return {Promise}
- * @private
- */
-browserTest.GetAccessCode.prototype.onUserInfoReady_ = function() {
-  return new Promise(function(resolve, reject){
-    remoting.identity.getUserInfo(resolve, reject);
-  });
-};