[remoting-test] Fix It2Me browser test failures.

remoting/webapp/browser_test/browser_test.js

Index: remoting/webapp/browser_test/browser_test.js
diff --git a/remoting/webapp/browser_test/browser_test.js b/remoting/webapp/browser_test/browser_test.js
index 67169883e023f8ca6bd04c424c8c954c4a94fce8..d29bb05aa1e32ed9313340d1452beaeb2b84bf36 100644
--- a/remoting/webapp/browser_test/browser_test.js
+++ b/remoting/webapp/browser_test/browser_test.js
@@ -273,16 +273,19 @@ 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(