Browsertests for improved reset options: powerwash and rollback.

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

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 181 matching lines @@
 void ResetScreenHandler::HandleOnRestart(bool should_rollback) {
   PrefService* prefs = g_browser_process->local_state();
   prefs->SetBoolean(prefs::kFactoryResetRequested, true);
   prefs->SetBoolean(prefs::kRollbackRequested, should_rollback);
   prefs->CommitPendingWrite();
 
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
 }
 
 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()->
         StartDeviceWipe();
   }
 }
 
 void ResetScreenHandler::HandleOnLearnMore() {
   if (!help_app_.get())
     help_app_ = new HelpAppLauncher(GetNativeWindow());
   help_app_->ShowHelpTopic(HelpAppLauncher::HELP_POWERWASH);
 }
 
 }  // namespace chromeos