[remoting-test] Fix It2Me browser test failures.

remoting/webapp/browser_test/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
  *
  * Provides basic functionality for JavaScript based browser test.
  *
  * To define a browser test, create a class under the browserTest namespace.
@@ skipping 255 matching lines @@
 
 /**
  * @param {remoting.DesktopRemoting.Mode} connectionMode
  * @param {Array<remoting.Error.Tag>} errorTags
  * @return {Promise}
  */
 browserTest.expectConnectionError = function(connectionMode, errorTags) {
   var AppMode = remoting.AppMode;
   var Timeout = browserTest.Timeout;
 
+  // Timeout if the session is not failed within 30 seconds.
+  var SESSION_CONNECTION_TIMEOUT = 30000;
+
   var finishButton = 'client-finished-me2me-button';
+  var failureMode = AppMode.CLIENT_CONNECT_FAILED_ME2ME;
 
   if (connectionMode == remoting.DesktopRemoting.Mode.IT2ME) {
     finishButton = 'client-finished-it2me-button';
+    failureMode = AppMode.CLIENT_CONNECT_FAILED_IT2ME;
   }
 
   var onConnected = browserTest.onUIMode(AppMode.IN_SESSION, Timeout.NONE);
-  var onFailure = Promise.race([
-      browserTest.onUIMode(AppMode.CLIENT_CONNECT_FAILED_ME2ME),
-      browserTest.onUIMode(AppMode.CLIENT_CONNECT_FAILED_IT2ME)]);
+  var onFailure = browserTest.onUIMode(failureMode, SESSION_CONNECTION_TIMEOUT);

[Jamie, 2015/06/18 01:05:30]

You've also made the test stricter, which is a good thing but should be called
out in the CL description.

 
   onConnected = onConnected.then(function() {
     return Promise.reject(
         'Expected the connection to fail.');
   });
 
   onFailure = onFailure.then(function() {
     /** @type {Element} */
     var errorDiv = document.getElementById('connect-error-message');
     var actual = errorDiv.innerText;
@@ skipping 142 matching lines @@
  */
 browserTest.ensureRemoteConnectionEnabled = function(pin) {
   browserTest.ensureHostStartedWithPIN(pin).then(function() {
     browserTest.pass();
   }, function(reason) {
     browserTest.fail(reason);
   });
 };
 
 browserTest.init();