[Merge to M59] md settings: Change action link to button on lock screen.

chrome/test/data/webui/settings/quick_unlock_authenticate_browsertest_chromeos.js

 // Copyright 2016 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.
 
 cr.define('settings_people_page_quick_unlock', function() {
   var element = null;
   var quickUnlockPrivateApi = null;
   var QuickUnlockMode = chrome.quickUnlockPrivate.QuickUnlockMode;
   var fakeUma = null;
 
@@ skipping 128 matching lines @@
   }
 
   function registerLockScreenTests() {
     suite('lock-screen', function() {
       /** @const */ var ENABLE_LOCK_SCREEN_PREF = 'settings.enable_screen_lock';
 
       var fakeSettings = null;
       var passwordRadioButton = null;
       var pinPasswordRadioButton = null;
       var noneRadioButton = null;
-      var configureButton = null;
 
       /**
        * Asserts that only the given radio button is active and all of the
        * others are inactive.
        * @param {Element} radioButton
        */
       function assertRadioButtonActive(radioButton) {
         function doAssert(element, name) {
           if (radioButton == element)
             assertTrue(element.active, 'Expected ' + name + ' to be active');
@@ skipping 20 matching lines @@
 
       /**
        * Changes the lock screen pref value using the settings API; this is like
        * the pref got changed from an unkown source such as another tab.
        * @param {boolean} value
        */
       function setLockScreenPref(value) {
         fakeSettings.setPref(ENABLE_LOCK_SCREEN_PREF, value, '', assertTrue);
       }
 
+      function isSetupPinButtonVisible() {
+        Polymer.dom.flush();
+        var setupPinButton = element.$$('#setupPinButton');
+        return isVisible(setupPinButton);
+      }
+
       setup(function(done) {
         PolymerTest.clearBody();
 
         CrSettingsPrefs.deferInitialization = true;
 
         // Build pref fakes.
         var fakePrefs = [{
           key: ENABLE_LOCK_SCREEN_PREF,
           type: chrome.settingsPrivate.PrefType.BOOLEAN,
           value: true
@@ skipping 22 matching lines @@
           document.body.appendChild(element);
           Polymer.dom.flush();
 
           element.setModes_ =
               quickUnlockPrivateApi.setModes.bind(quickUnlockPrivateApi, '');
 
           passwordRadioButton =
               getFromElement('paper-radio-button[name="password"]');
           pinPasswordRadioButton =
               getFromElement('paper-radio-button[name="pin+password"]');
-          configureButton = getFromElement('a[is="action-link"]');
 
           done();
         });
       });
 
       // Showing the choose method screen does not make any destructive pref or
       // quickUnlockPrivate calls.
       test('ShowingScreenDoesNotModifyPrefs', function() {
         assertTrue(getLockScreenPref());
         assertRadioButtonActive(passwordRadioButton);
         assertDeepEquals([], quickUnlockPrivateApi.activeModes);
       });
 
       // The various radio buttons update internal state and do not modify
       // prefs.
       test('TappingButtonsChangesUnderlyingState', function() {
         function togglePin() {
           assertRadioButtonActive(passwordRadioButton);
 
           // Tap pin+password button.
           MockInteractions.tap(pinPasswordRadioButton);
           assertRadioButtonActive(pinPasswordRadioButton);
-          assertTrue(isVisible(configureButton));
+          assertTrue(isSetupPinButtonVisible());
           assertDeepEquals([], quickUnlockPrivateApi.activeModes);
 
           // Enable quick unlock so that we verify tapping password disables it.
           setActiveModes([QuickUnlockMode.PIN]);
 
           // Tap password button and verify quick unlock is disabled.
           MockInteractions.tap(passwordRadioButton);
           assertRadioButtonActive(passwordRadioButton);
-          assertFalse(isVisible(configureButton));
+          assertFalse(isSetupPinButtonVisible());
           assertDeepEquals([], quickUnlockPrivateApi.activeModes);
         }
 
         // Verify toggling PIN on/off does not disable screen lock.
         setLockScreenPref(true);
         togglePin();
         assertTrue(getLockScreenPref());
 
         // Verify toggling PIN on/off does not enable screen lock.
         setLockScreenPref(false);
         togglePin();
         assertFalse(getLockScreenPref());
       });
 
       // If quick unlock is changed by another settings page the radio button
       // will update to show quick unlock is active.
       test('EnablingQuickUnlockChangesButtonState', function() {
         setActiveModes([QuickUnlockMode.PIN]);
         assertRadioButtonActive(pinPasswordRadioButton);
-        assertTrue(isVisible(configureButton));
+        assertTrue(isSetupPinButtonVisible());
 
         setActiveModes([]);
         assertRadioButtonActive(passwordRadioButton);
         assertDeepEquals([], quickUnlockPrivateApi.activeModes);
       });
 
       // Tapping the PIN configure button opens up the setup PIN dialog, and
       // records a chose pin or password uma.
       test('TappingConfigureOpensSetupPin', function() {
         assertEquals(0, fakeUma.getHistogramValue(
             LockScreenProgress.CHOOSE_PIN_OR_PASSWORD));
         assertRadioButtonActive(passwordRadioButton);
 
         MockInteractions.tap(pinPasswordRadioButton);
-        assertTrue(isVisible(configureButton));
+        assertTrue(isSetupPinButtonVisible());
         assertRadioButtonActive(pinPasswordRadioButton)
 
-        MockInteractions.tap(configureButton);
+        Polymer.dom.flush();
+        MockInteractions.tap(getFromElement('#setupPinButton'));
         var setupPinDialog = getFromElement('#setupPin');
         assertTrue(setupPinDialog.$.dialog.open);
         assertEquals(1, fakeUma.getHistogramValue(
             LockScreenProgress.CHOOSE_PIN_OR_PASSWORD));
       });
     });
   }
 
   function registerSetupPinDialogTests() {
     suite('setup-pin-dialog', function() {
@@ skipping 172 matching lines @@
       });
     });
   }
 
   return {
     registerAuthenticateTests: registerAuthenticateTests,
     registerLockScreenTests: registerLockScreenTests,
     registerSetupPinDialogTests: registerSetupPinDialogTests
   };
 });