HostTableEntry refactor

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 112 matching lines @@
  */
 browserTest.pass = function() {
   browserTest.automationController_.send(JSON.stringify({
     succeeded: true,
     error_message: '',
     stack_trace: ''
   }));
 };
 
 /**
- * @param {string} id
+ * @param {string} id The id or the selector of the element.
  * @return {void}
  */
 browserTest.clickOnControl = function(id) {
   var element = document.getElementById(id);
+  if (!element) {
+    element = document.querySelector(id);
+  }
   browserTest.expect(element, 'No such element: ' + id);
   element.click();
 };
 
 /**
  * @param {remoting.AppMode} expectedMode
  * @param {number=} opt_timeout
  * @return {Promise}
  */
 browserTest.onUIMode = function(expectedMode, opt_timeout) {
@@ skipping 38 matching lines @@
 };
 
 /**
  * @return {Promise}
  */
 browserTest.connectMe2Me = function() {
   var AppMode = remoting.AppMode;
   // The one second timeout is necessary because the click handler of
   // 'this-host-connect' is registered asynchronously.
   return base.Promise.sleep(1000).then(function() {
-      browserTest.clickOnControl('this-host-connect');
+      browserTest.clickOnControl('local-host-connect-button');
     }).then(function(){
       return browserTest.onUIMode(AppMode.CLIENT_HOST_NEEDS_UPGRADE);
     }).then(function() {
       // On fulfilled.
       browserTest.clickOnControl('host-needs-update-connect-button');
     }, function() {
       // On time out.
       return Promise.resolve();
     }).then(function() {
       return browserTest.onUIMode(AppMode.CLIENT_PIN_PROMPT, 10000);
@@ skipping 194 matching lines @@
  * @param {string} pin
  * @return {Promise}
  */
 browserTest.ensureHostStartedWithPIN = function(pin) {
   // Return if host is already
   return browserTest.isLocalHostStarted().then(
       /** @param {boolean} started */
       function(started){
         if (!started) {
           console.log('browserTest: Enabling remote connection.');
-          browserTest.clickOnControl('start-daemon');
+          browserTest.clickOnControl('.start-daemon');
         } else {
           console.log('browserTest: Changing the PIN of the host to: ' +
               pin + '.');
-          browserTest.clickOnControl('change-daemon-pin');
+          browserTest.clickOnControl('.change-daemon-pin');
         }
         return browserTest.setupPIN(pin);
       });
 };
 
 /**
  * Called by Browser Test in C++
  * @param {string} pin
  * @suppress {checkTypes}
  */
 browserTest.ensureRemoteConnectionEnabled = function(pin) {
   browserTest.ensureHostStartedWithPIN(pin).then(function() {
     browserTest.pass();
   }, function(reason) {
     browserTest.fail(reason);
   });
 };
 
 browserTest.init();