Revert of Rollback option put behind the flag.

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"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/reset/metrics.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/dbus/update_engine_client.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 67 matching lines @@
     return;
   }
 
   PrefService* prefs = g_browser_process->local_state();
   restart_required_ = !CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kFirstExecAfterBoot);
   reboot_was_requested_ = false;
   rollback_available_ = false;
   if (!restart_required_)  // First exec after boot.
     reboot_was_requested_ = prefs->GetBoolean(prefs::kFactoryResetRequested);
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableRollbackOption)) {
-    rollback_available_ = false;
-    ShowWithParams();
-  } else if (!restart_required_ && reboot_was_requested_) {
+  if (!restart_required_ && reboot_was_requested_) {
     // First exec after boot.
     rollback_available_ = prefs->GetBoolean(prefs::kRollbackRequested);
     ShowWithParams();
   } else {
     chromeos::DBusThreadManager::Get()->GetUpdateEngineClient()->
         CanRollbackCheck(base::Bind(&ResetScreenHandler::OnRollbackCheck,
         weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
@@ skipping 108 matching lines @@
 }
 
 void ResetScreenHandler::HandleOnLearnMore() {
   if (!help_app_.get())
     help_app_ = new HelpAppLauncher(GetNativeWindow());
   help_app_->ShowHelpTopic(HelpAppLauncher::HELP_POWERWASH);
 }
 
 void ResetScreenHandler::UpdateStatusChanged(
     const UpdateEngineClient::Status& status) {
-  VLOG(1) << "Update status change to " << status.status;
   if (status.status == UpdateEngineClient::UPDATE_STATUS_ERROR) {
     // Show error screen.
     base::DictionaryValue params;
     params.SetInteger("uiState", kErrorUIStateRollback);
     ShowScreen(OobeUI::kScreenErrorMessage, &params);
   } else if (status.status ==
       UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT) {
     DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
   }
 }
 
 }  // namespace chromeos