Settings Router Refactor: Clean up Quick Unlock (and a few misc fixes)

chrome/browser/resources/settings/people_page/quick_unlock_setup_pin.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.
 
 /**
  * @fileoverview
  * 'settings-quick-unlock-setup-pin' is the settings page for choosing a PIN.
  *
  * Example:
  *
@@ skipping 33 matching lines @@
  * @const
  */
 var WEAK_PINS = [
   '1234', '1111', '0000', '1212', '7777', '1004', '2000', '4444', '2222',
   '6969'
 ];
 
 Polymer({
   is: 'settings-quick-unlock-setup-pin',
 
-  behaviors: [
-    QuickUnlockPasswordDetectBehavior,
-    I18nBehavior
-  ],
+  behaviors: [I18nBehavior, QuickUnlockPasswordDetectBehavior],
 
   properties: {
+    /** @type {!settings.Route} */
+    currentRoute: {
+      type: Object,
+      observer: 'onRouteChanged_',
+    },
+
     /**
      * The current PIN keyboard value.
      * @private
      */
     pinKeyboardValue_: String,
 
     /**
      * Stores the initial PIN value so it can be confirmed.
      * @private
      */
@@ skipping 19 matching lines @@
     /**
      * The current step/subpage we are on.
      * @private
      */
     isConfirmStep_: {
       type: Boolean,
       value: false
     },
   },
 
-  observers: [
-    'onRouteChanged_(currentRoute)',
-    'onSetModesChanged_(setModes)'
-  ],
+  observers: ['onSetModesChanged_(setModes)'],
 
   /** @override */
   attached: function() {
     this.resetState_();
 
-    if (this.isScreenActive(QuickUnlockScreen.SETUP_PIN))
+    if (this.currentRoute == settings.Route.QUICK_UNLOCK_SETUP_PIN)
       this.askForPasswordIfUnset();
   },
 
   /**
    * @param {!settings.Route} currentRoute
    * @private
    */
   onRouteChanged_: function(currentRoute) {
-    if (this.isScreenActive(QuickUnlockScreen.SETUP_PIN)) {
+    if (this.currentRoute == settings.Route.QUICK_UNLOCK_SETUP_PIN) {
       this.askForPasswordIfUnset();
     } else {
       // If the user hits the back button, they can leave the element
       // half-completed; therefore, reset state if the element is not active.
       this.resetState_();
     }
   },
 
   /** @private */
   onSetModesChanged_: function() {
-    if (this.isScreenActive(QuickUnlockScreen.SETUP_PIN))
+    if (this.currentRoute == settings.Route.QUICK_UNLOCK_SETUP_PIN)
       this.askForPasswordIfUnset();
   },
 
   /**
    * Resets the element to the initial state.
    * @private
    */
   resetState_: function() {
     this.initialPin_ = '';
     this.pinKeyboardValue_ = '';
@@ skipping 150 matching lines @@
    * @return {string}
    */
   getContinueMessage_: function(isConfirmStep) {
     if (!isConfirmStep)
       return this.i18n('quickUnlockConfigurePinContinueButton');
     return this.i18n('save');
   },
 });
 
 })();