Revert of fix quick unlock config in options

chrome/browser/resources/settings/people_page/lock_screen.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-lock-screen' allows the user to change how they unlock their
  * device.
  *
  * Example:
@@ skipping 71 matching lines @@
   },
 
   /** @private {?settings.FingerprintBrowserProxy} */
   browserProxy_: null,
 
   /** selectedUnlockType is defined in LockStateBehavior. */
   observers: ['selectedUnlockTypeChanged_(selectedUnlockType)'],
 
   /** @override */
   attached: function() {
-    if (this.shouldAskForPassword_(settings.getCurrentRoute()))
-      this.$.passwordPrompt.open();
+    // currentRouteChanged is not called during the initial navigation. If the
+    // user navigates directly to the lockScreen page, we still want to show the
+    // password prompt page.
+    this.currentRouteChanged(settings.Route.LOCK_SCREEN,
+        settings.Route.LOCK_SCREEN);
     this.browserProxy_ = settings.FingerprintBrowserProxyImpl.getInstance();
   },
 
   /**
    * Overridden from settings.RouteObserverBehavior.
    * @param {!settings.Route} newRoute
    * @param {!settings.Route} oldRoute
    * @protected
    */
   currentRouteChanged: function(newRoute, oldRoute) {
     if (newRoute == settings.Route.LOCK_SCREEN &&
         this.fingerprintUnlockEnabled_ &&
         this.browserProxy_) {
       this.browserProxy_.getNumFingerprints().then(
           function(numFingerprints) {
             this.numFingerprints_ = numFingerprints;
           }.bind(this));
     }
 
-    if (this.shouldAskForPassword_(newRoute)) {
+    if (newRoute == settings.Route.LOCK_SCREEN && !this.setModes_) {
       this.$.passwordPrompt.open();
     } else if (newRoute != settings.Route.FINGERPRINT &&
         oldRoute != settings.Route.FINGERPRINT) {
       // If the user navigated away from the lock screen settings page they will
       // have to re-enter their password. An exception is if they are navigating
       // to or from the fingerprint subpage.
       this.setModes_ = undefined;
     }
   },
 
   /**
    * Called when the unlock type has changed.
    * @param {!string} selected The current unlock type.
    * @private
    */
   selectedUnlockTypeChanged_: function(selected) {
     if (selected == LockScreenUnlockType.VALUE_PENDING)
       return;
 
     if (selected != LockScreenUnlockType.PIN_PASSWORD && this.setModes_) {
       this.setModes_.call(null, [], [], function(didSet) {
         assert(didSet, 'Failed to clear quick unlock modes');
       });
     }
   },
 
   /** @private */
   onSetModesChanged_: function() {
-    if (this.shouldAskForPassword_(settings.getCurrentRoute())) {
+    if (settings.getCurrentRoute() == settings.Route.LOCK_SCREEN &&
+        !this.setModes_) {
       this.$.setupPin.close();
       this.$.passwordPrompt.open();
     }
   },
 
   /** @private */
   onPasswordClosed_: function() {
     if (!this.setModes_)
       settings.navigateTo(settings.Route.PEOPLE);
   },
@@ skipping 37 matching lines @@
   onConfigurePin_: function(e) {
     e.preventDefault();
     this.$.setupPin.open();
     this.writeUma_(LockScreenProgress.CHOOSE_PIN_OR_PASSWORD);
   },
 
   /** @private */
   onEditFingerprints_: function() {
     settings.navigateTo(settings.Route.FINGERPRINT);
   },
-
-  /**
-   * @param {!settings.Route} route
-   * @return {boolean} Whether the password dialog should be shown.
-   * @private
-   */
-  shouldAskForPassword_: function(route) {
-    return route == settings.Route.LOCK_SCREEN && !this.setModes_;
-  },
 });