Browsertests for improved reset options: powerwash and rollback.

chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
index 83123264d8042c213724cc456037db0ac443e62a..13603ebc4ef456e3d39b2403be80a79aae501006 100644
--- a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
@@ -199,10 +199,10 @@ void ResetScreenHandler::HandleOnRestart(bool should_rollback) {
 }
 
 void ResetScreenHandler::HandleOnPowerwash(bool rollback_checked) {
-  if (rollback_checked && rollback_available_) {
+  if (rollback_available_ && (rollback_checked || reboot_was_requested_)) {
       chromeos::DBusThreadManager::Get()->GetUpdateEngineClient()->Rollback();
   } else {
-    if (rollback_checked)
+    if (rollback_checked && !rollback_available_)
       NOTREACHED() <<
           "Rollback was checked but not available. Starting powerwash.";
     chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->