Handle host need upgrade in Pin browser test

remoting/webapp/browser_test/update_pin_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. Change the PIN.
  * 2. Connect with the new PIN.
  * 3. Verify the connection succeeded.
  * 4. Disconnect and reconnect with the old PIN.
  * 5. Verify the connection failed.
  */
 
 'use strict';
 
 /** @constructor */
 browserTest.Update_PIN = function() {};
 
 browserTest.Update_PIN.prototype.run = function(data) {
   var LOGIN_BACKOFF_WAIT = 2000;
   // Input validation
   browserTest.expect(typeof data.new_pin == 'string');
   browserTest.expect(typeof data.old_pin == 'string');
   browserTest.expect(data.new_pin != data.old_pin,
                      'The new PIN and the old PIN cannot be the same');
 
   this.changePIN_(data.new_pin).then(
-    this.connect_.bind(this)
+    browserTest.connectMe2Me
   ).then(
     this.enterPIN_.bind(this, data.old_pin, true /* expectError*/)
   ).then(
     // Sleep for two seconds to allow for the login backoff logic to reset.
     base.Promise.sleep.bind(null, LOGIN_BACKOFF_WAIT)
   ).then(
-    this.connect_.bind(this)
+    browserTest.connectMe2Me
   ).then(
     this.enterPIN_.bind(this, data.new_pin, false /* expectError*/)
   ).then(
     // Clean up the test by disconnecting and changing the PIN back
-    this.disconnect_.bind(this)
+    browserTest.connectMe2Me

[Jamie, 2014/07/11 19:33:22]

Is this a copy/paste error? The previous code was disconnecting, but the new
code is connecting.

[kelvinp, 2014/07/11 21:11:22]

My bad.  Good catch.

   ).then(
     // The PIN must be restored regardless of success or failure.
     this.changePIN_.bind(this, data.old_pin),
     this.changePIN_.bind(this, data.old_pin)
   ).then(
     // On fulfilled.
     browserTest.pass,
     // On rejected.
     browserTest.fail
   );
@@ skipping 12 matching lines @@
     browserTest.clickOnControl('daemon-pin-ok');
     return onSetupDone;
   }).then(function() {
     browserTest.clickOnControl('host-config-done-dismiss');
     // On Linux, we restart the host after changing the PIN, need to sleep
     // for ten seconds before the host is ready for connection.
     return base.Promise.sleep(HOST_RESTART_WAIT);
   });
 };
 
-browserTest.Update_PIN.prototype.connect_ = function() {
-  browserTest.clickOnControl('this-host-connect');
-  return browserTest.onUIMode(remoting.AppMode.CLIENT_PIN_PROMPT);
-};
-
 browserTest.Update_PIN.prototype.disconnect_ = function() {
   var AppMode = remoting.AppMode;
 
   remoting.disconnect();
 
   return browserTest.onUIMode(AppMode.CLIENT_SESSION_FINISHED_ME2ME)
   .then(function() {
     var onHome = browserTest.onUIMode(AppMode.HOME);
     browserTest.clickOnControl('client-finished-me2me-button');
     return onHome;
@@ skipping 10 matching lines @@
   return base.Promise.sleep(CONNECT_PIN_WAIT).then(function() {
     browserTest.clickOnControl('pin-connect-button');
   }).then(function() {
     if (expectError) {
       return browserTest.expectMe2MeError(remoting.Error.INVALID_ACCESS_CODE);
     } else {
       return browserTest.expectMe2MeConnected();
     }
   });
 };