autofill/options: address some nits I had on one of rouslan@'s CLs[1].

chrome/browser/ui/webui/options/autofill_options_browsertest.js

 // Copyright (c) 2012 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.
 
 /**
  * Returns the HTML element for the |field|.
  * @param {string} field The field name for the element.
  * @return {HTMLElement} The HTML element.
  */
 function getField(field) {
   return document.querySelector(
       '#autofill-edit-address-overlay [field=' + field + ']');
 }
 
 /**
  * Returns the size of the |list|.
  * @param {HTMLElement} list The list to check.
- * @return {int} The size of the list.
+ * @return {number} The size of the list.
  */
 function getListSize(list) {
   // Remove 1 for placeholder input field.
   return list.items.length - 1;
 }
 
 /**
  * TestFixture for autofill options WebUI testing.
  * @extends {testing.Test}
  * @constructor
@@ skipping 17 matching lines @@
 /**
  * TestFixture for autofill edit address overlay WebUI testing.
  * @extends {testing.Test}
  * @constructor
  */
 function AutofillEditAddressWebUITest() {}
 
 AutofillEditAddressWebUITest.prototype = {
   __proto__: testing.Test.prototype,
 
-  /**
-   * Browse to autofill edit address overlay.
-   */
+  /** @override  */
   browsePreload: 'chrome://settings-frame/autofillEditAddress',
-
-  /** @override  */
-  isAsync: true,
 };
 
-TEST_F('AutofillEditAddressWebUITest',
-       'testAutofillPhoneValueListDoneValidating',
-       function() {
-  assertEquals(this.browsePreload, document.location.href);
-
-  var phoneList = getField('phone');
-  expectEquals(0, phoneList.validationRequests_);
-  phoneList.doneValidating().then(function() {
-    phoneList.focus();
-    var input = phoneList.querySelector('input');
-    input.focus();
-    document.execCommand('insertText', false, '111-222-333');
-    assertEquals('111-222-333', input.value);
-    input.blur();
-    phoneList.doneValidating().then(function() {
-      testDone();
-    });
-  });
-});
-
-TEST_F('AutofillEditAddressWebUITest',
-       'testInitialFormLayout',
-       function() {
+TEST_F('AutofillEditAddressWebUITest', 'testInitialFormLayout', function() {
   assertEquals(this.browsePreload, document.location.href);
 
   assertEquals(getField('country').value, '');
   assertEquals(0, getListSize(getField('phone')));
   assertEquals(0, getListSize(getField('email')));
   assertEquals(0, getListSize(getField('fullName')));
   assertEquals('', getField('city').value);
 
   testDone();
 });
 
-TEST_F('AutofillEditAddressWebUITest',
-       'testLoadAddress',
-       function() {
+TEST_F('AutofillEditAddressWebUITest', 'testLoadAddress', function() {
   assertEquals(this.browsePreload, document.location.href);
 
   var testAddress = {
     guid: 'GUID Value',
     fullName: ['Full Name 1', 'Full Name 2'],
     companyName: 'Company Name Value',
     addrLines: 'First Line Value\nSecond Line Value',
     dependentLocality: 'Dependent Locality Value',
     city: 'City Value',
     state: 'State Value',
@@ skipping 10 matching lines @@
        {field: 'city', length: 'short'},
        {field: 'state', length: 'short'},
        {field: 'addrLines', length: 'long'},
        {field: 'companyName', length: 'long'},
        {field: 'country', length: 'long'},
        {field: 'fullName', length: 'long', placeholder: 'Add name'}
     ]]
   };
   AutofillEditAddressOverlay.loadAddress(testAddress);
 
-  assertEquals(testAddress.guid, AutofillEditAddressOverlay.getInstance().guid);
-  assertEquals(testAddress.languageCode,
-               AutofillEditAddressOverlay.getInstance().languageCode);
+  var overlay = AutofillEditAddressOverlay.getInstance();
+  assertEquals(testAddress.guid, overlay.guid_);
+  assertEquals(testAddress.languageCode, overlay.languageCode_);
 
   var lists = ['fullName', 'email', 'phone'];
   for (var i in lists) {
     var field = getField(lists[i]);
     assertEquals(testAddress[lists[i]].length, getListSize(field));
     assertTrue(field.getAttribute('placeholder').length > 0);
     assertTrue(field instanceof cr.ui.List);
   }
 
   var inputs = ['companyName', 'dependentLocality', 'city', 'state',
                 'postalCode', 'sortingCode'];
   for (var i in inputs) {
     var field = getField(inputs[i]);
     assertEquals(testAddress[inputs[i]], field.value);
     assertTrue(field instanceof HTMLInputElement);
   }
 
   var addrLines = getField('addrLines');
   assertEquals(testAddress.addrLines, addrLines.value);
   assertTrue(addrLines instanceof HTMLTextAreaElement);
 
   var country = getField('country');
   assertEquals(testAddress.country, country.value);
   assertTrue(country instanceof HTMLSelectElement);
-
-  testDone();
 });
 
-TEST_F('AutofillEditAddressWebUITest',
-       'testLoadAddressComponents',
-       function() {
+TEST_F('AutofillEditAddressWebUITest', 'testLoadAddressComponents', function() {
   assertEquals(this.browsePreload, document.location.href);
 
   var testInput = {
     languageCode: 'fr',
     components: [[{field: 'city'}],
                  [{field: 'state'}]]
   };
   AutofillEditAddressOverlay.loadAddressComponents(testInput);
 
-  assertEquals('fr', AutofillEditAddressOverlay.getInstance().languageCode);
+  assertEquals('fr', AutofillEditAddressOverlay.getInstance().languageCode_);
   expectEquals(2, $('autofill-edit-address-fields').children.length);
+});
 
-  testDone();
+/**
+ * Class to test the autofill edit address overlay asynchronously.
+ * @extends {testing.Test}
+ * @constructor
+ */
+function AutofillEditAddressAsyncWebUITest() {}
+
+AutofillEditAddressAsyncWebUITest.prototype = {
+  __proto__: testing.Test.prototype,
+
+  /** @override */
+  browsePreload: 'chrome://settings-frame/autofillEditAddress',
+
+  /** @override */
+  isAsync: true,
+};
+
+TEST_F('AutofillEditAddressAsyncWebUITest',
+       'testAutofillPhoneValueListDoneValidating',
+       function() {
+  assertEquals(this.browsePreload, document.location.href);
+
+  var phoneList = getField('phone');
+  expectEquals(0, phoneList.validationRequests_);
+  phoneList.doneValidating().then(function() {
+    phoneList.focus();
+    var input = phoneList.querySelector('input');
+    input.focus();
+    document.execCommand('insertText', false, '111-222-333');
+    assertEquals('111-222-333', input.value);
+    input.blur();
+    phoneList.doneValidating().then(testDone);
+  });
 });