UI flow rework for device reset options. Reset made available from gaia screen. Tests adapted.

ui/login/display_manager.js

Index: ui/login/display_manager.js
diff --git a/ui/login/display_manager.js b/ui/login/display_manager.js
index a26af0be23abbc2cb35ca640db5e3e2e1484540b..d2c0b6f8d99e0cf7f65fd513816301ffbfde1d35 100644
--- a/ui/login/display_manager.js
+++ b/ui/login/display_manager.js
@@ -46,6 +46,10 @@
 /** @const */ var ACCELERATOR_APP_LAUNCH_BAILOUT = 'app_launch_bailout';
 /** @const */ var ACCELERATOR_APP_LAUNCH_NETWORK_CONFIG =
     'app_launch_network_config';
+/** @const */ var ACCELERATOR_SHOW_ROLLBACK_ON_RESET =
+    'show_rollback_on_reset_screen';
+/** @const */ var ACCELERATOR_HIDE_ROLLBACK_ON_RESET =
+    'hide_rollback_on_reset_screen';
 
 /* Signin UI state constants. Used to control header bar UI. */
 /** @const */ var SIGNIN_UI_STATE = {
@@ -372,6 +376,12 @@ cr.define('cr.ui.login', function() {
       } else if (name == ACCELERATOR_APP_LAUNCH_NETWORK_CONFIG) {
         if (currentStepId == SCREEN_APP_LAUNCH_SPLASH)
           chrome.send('networkConfigRequest');
+      } else if (name == ACCELERATOR_SHOW_ROLLBACK_ON_RESET) {
+        if (currentStepId == SCREEN_OOBE_RESET)
+          chrome.send('showRollbackOnResetScreen');
+      } else if (name == ACCELERATOR_HIDE_ROLLBACK_ON_RESET) {
+        if (currentStepId == SCREEN_OOBE_RESET)
+          chrome.send('hideRollbackOnResetScreen');
       }
 
       if (!this.forceKeyboardFlow_)