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

chrome/browser/resources/settings/people_page/quick_unlock_authenticate.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-authenticate' shows a password input prompt to the
  * user. It validates the password is correct. Once the user has entered their
  * account password, the page navigates to the quick unlock setup methods page.
@@ skipping 28 matching lines @@
   chrome.quickUnlockPrivate.getActiveModes(function(modes) {
     var credentials =
         /** @type {!Array<string>} */ (Array(modes.length).fill(''));
     chrome.quickUnlockPrivate.setModes(password, modes, credentials, onCheck);
   });
 }
 
 Polymer({
   is: 'settings-quick-unlock-authenticate',
 
-  behaviors: [
-    QuickUnlockRoutingBehavior,
-  ],
+  properties: {
+    /** @type {!settings.Route} */
+    currentRoute: {
+      type: Object,
+      observer: 'onRouteChanged_',
+    },
 
-  properties: {
     /**
      * A wrapper around chrome.quickUnlockPrivate.setModes with the account
      * password already supplied. If this is null, the authentication screen
      * needs to be redisplayed. This property will be cleared after
      * PASSWORD_ACTIVE_DURATION_MS milliseconds.
      */
     setModes: {
       type: Object,
       notify: true
     },
@@ skipping 12 matching lines @@
      */
     password_: String,
 
     /**
      * Helper property which marks password as valid/invalid.
      * @private
      */
     passwordInvalid_: Boolean
   },
 
-  observers: [
-    'onRouteChanged_(currentRoute)'
-  ],
-
   /** @private */
   onRouteChanged_: function(currentRoute) {
     // Clear local state if this screen is not active so if this screen shows
     // up again the user will get a fresh UI.
-    if (!this.isScreenActive(QuickUnlockScreen.AUTHENTICATE)) {
+    if (this.currentRoute != settings.Route.QUICK_UNLOCK_AUTHENTICATE) {
       this.password_ = '';
       this.passwordInvalid_ = false;
     }
   },
 
   /**
    * Start or restart a timer to check the account password and move past the
    * authentication screen.
    * @private
    */
@@ skipping 47 matching lines @@
 
         settings.navigateTo(settings.Route.QUICK_UNLOCK_CHOOSE_METHOD);
       }
     }
 
     checkAccountPassword_(this.password_, onPasswordChecked.bind(this));
   }
 });
 
 })();