Revert of EasyUnlock: Work around the ghost overlay from CSS animation.

chrome/browser/resources/options/easy_unlock_turn_off_overlay.js

 // Copyright 2014 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('options', function() {
   var Page = cr.ui.pageManager.Page;
   var PageManager = cr.ui.pageManager.PageManager;
 
   // UI state of the turn off overlay.
   // @enum {string}
@@ skipping 74 matching lines @@
       } else {
         this.uiState = UIState.OFFLINE;
       }
     },
 
     /** @override */
     didClosePage: function() {
       chrome.send('easyUnlockTurnOffOverlayDismissed');
     },
 
-    /** @override */
-    handleCancel: function() {
-      // Make sure keyboard dismiss uses the word around as well.
-      // TODO(xiyuan): Remove the workaround. See http://crbug.com/405250
-      EasyUnlockTurnOffOverlay.dismiss();
-    },
-
     /**
      * Returns the button strip element.
      * @return {HTMLDivElement} The container div of action buttons.
      */
     get buttonStrip() {
       return this.pageDiv.querySelector('.button-strip');
     },
 
     /**
      * Set visibility of action buttons in button strip.
@@ skipping 63 matching lines @@
       this.setSpinnerVisible_(false);
       $('easy-unlock-turn-off-confirm').disabled = false;
       $('easy-unlock-turn-off-dismiss').hidden = true;
     },
   };
 
   /**
    * Closes the Easy unlock turn off overlay.
    */
   EasyUnlockTurnOffOverlay.dismiss = function() {
-    // TODO(xiyuan): Remove the workaround and call closeOverly directly.
-    // See http://crbug.com/405250
-    $('easy-unlock-turn-off-spinner').hidden = true;
-    window.setTimeout(function() {
-      PageManager.closeOverlay();
-    }, 100);
+    PageManager.closeOverlay();
   };
 
   /**
    * Update UI to reflect the turn off operation status.
    * @param {string} newState The UIState string representing the new state.
    */
   EasyUnlockTurnOffOverlay.updateUIState = function(newState) {
     EasyUnlockTurnOffOverlay.getInstance().uiState = newState;
   };
 
   // Export
   return {
     EasyUnlockTurnOffOverlay: EasyUnlockTurnOffOverlay
   };
 });