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

chrome/browser/chromeos/reset/metrics.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_RESET_METRICS_H_
 #define CHROME_BROWSER_CHROMEOS_RESET_METRICS_H_
 
 namespace chromeos {
 namespace reset {
 
 enum DialogViewType {
 
   // User invoked the dialog from options page.
   DIALOG_FROM_OPTIONS,
 
+    // Invoked with shortcut. Requesting restart form.
+  DIALOG_SHORTCUT_RESTART_REQUIRED,

[Dmitry Polukhin, 2014/08/22 07:58:23]

It seems that it is structure that is used in UMA metric so you need to add new
members only to the end and also you need to update
tools/metrics/histograms/histograms.xml accordingly and add histograms owners
for review.

[merkulova, 2014/08/22 09:46:46]

Done.

+
   // Invoked with shortcut. Confirming form for powerwash.
   DIALOG_SHORTCUT_CONFIRMING_POWERWASH_ONLY,
 
   // Invoked with shortcut. Confirming form for powerwash and rollback.
   DIALOG_SHORTCUT_CONFIRMING_POWERWASH_AND_ROLLBACK,
 
-  // Invoked with shortcut. Offering form, rollback checkbox unavailable.
+  // Invoked with shortcut. Offering form, rollback option set.
   DIALOG_SHORTCUT_OFFERING_ROLLBACK_UNAVAILABLE,
 
-  // Invoked with shortcut. Offering form, rollback checkbox available.
+  // Invoked with shortcut. Offering form, rollback option not set.
   DIALOG_SHORTCUT_OFFERING_ROLLBACK_AVAILABLE,
 
   // Must be last enum element.
   DIALOG_VIEW_TYPE_SIZE
 };
 
 }  // namespace reset
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_RESET_METRICS_H_