Rollback option put behind the flag.

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 4ae16a7dd3e869e5d20ade998a776d5c7c2d8e93..bc2694333b51cdf39ef644383d08ad6a01495ee5 100644
--- a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
@@ -14,7 +14,6 @@
 #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"
@@ -102,7 +101,11 @@ void ResetScreenHandler::Show() {
   rollback_available_ = false;
   if (!restart_required_)  // First exec after boot.
     reboot_was_requested_ = prefs->GetBoolean(prefs::kFactoryResetRequested);
-  if (!restart_required_ && reboot_was_requested_) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableRollbackOption)) {

[Nikita (slow), 2014/05/08 10:52:47]

nit: 4 spaces indent

+    rollback_available_ = false;

[Nikita (slow), 2014/05/08 10:52:47]

nit: How about just calling OnRollbackCheck(false) here?

+    ShowWithParams();
+  } else if (!restart_required_ && reboot_was_requested_) {
     // First exec after boot.
     rollback_available_ = prefs->GetBoolean(prefs::kRollbackRequested);
     ShowWithParams();
@@ -231,6 +234,7 @@ void ResetScreenHandler::HandleOnLearnMore() {
 
 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;