Revert of Rollback option put behind the flag. (https://codereview.chromium.org/267393011/)

Reason for revert:
This seems to have broken ResetFirstAfterBootTest.SuccessOnRollbackRequested on http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%282%29/builds/23801.

Original issue's description:
> Rollback option put behind the flag.
> 
> BUG=368860
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=269753

TBR=nkostylev@chromium.org,merkulova@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=368860

Review URL: https://codereview.chromium.org/279203002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269762 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/login/reset_browsertest.cc

@@ -105,9 +105,7 @@ IN_PROC_BROWSER_TEST_F(ResetTest, ShowAndCancel) {
   JSExpect("!document.querySelector('#reset.hidden')");
   CloseResetScreen();
   JSExpect("!!document.querySelector('#reset.hidden')");
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableRollbackOption))
-    EXPECT_EQ(1, update_engine_client_->can_rollback_call_count());
+  EXPECT_EQ(1, update_engine_client_->can_rollback_call_count());
 }
 
 IN_PROC_BROWSER_TEST_F(ResetTest, PRE_RestartBeforePowerwash) {
@@ -179,18 +177,15 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ShortcutInvokedCases) {
   CloseResetScreen();
   OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait();
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableRollbackOption)) {
-    // rollback available and checked
-    InvokeResetScreen();
-    ASSERT_TRUE(content::ExecuteScript(
-        web_contents(),
-        "$('reset-rollback-checkbox').checked = true;"));
-    ClickResetButton();
-    EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
-    EXPECT_EQ(2, session_manager_client_->start_device_wipe_call_count());
-    EXPECT_EQ(1, update_engine_client_->rollback_call_count());
-  }
+  // rollback available and checked
+  InvokeResetScreen();
+  ASSERT_TRUE(content::ExecuteScript(
+      web_contents(),
+      "$('reset-rollback-checkbox').checked = true;"));
+  ClickResetButton();
+  EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
+  EXPECT_EQ(2, session_manager_client_->start_device_wipe_call_count());
+  EXPECT_EQ(1, update_engine_client_->rollback_call_count());
 }
 
 IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PRE_PowerwashRequested) {
@@ -225,18 +220,14 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ErrorOnRollbackRequested) {
   EXPECT_EQ(0, update_engine_client_->rollback_call_count());
   JSExpect("!$('reset').classList.contains('revert-promise')");
   ClickResetButton();
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableRollbackOption)) {
-    EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
-    EXPECT_EQ(0, session_manager_client_->start_device_wipe_call_count());
-    EXPECT_EQ(1, update_engine_client_->rollback_call_count());
-    JSExpect("$('reset').classList.contains('revert-promise')");
-    UpdateEngineClient::Status error_update_status;
-    error_update_status.status = UpdateEngineClient::UPDATE_STATUS_ERROR;
-    update_engine_client_->NotifyObserversThatStatusChanged(
-        error_update_status);
-    OobeScreenWaiter(OobeDisplay::SCREEN_ERROR_MESSAGE).Wait();
-  }
+  EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
+  EXPECT_EQ(0, session_manager_client_->start_device_wipe_call_count());
+  EXPECT_EQ(1, update_engine_client_->rollback_call_count());
+  JSExpect("$('reset').classList.contains('revert-promise')");
+  UpdateEngineClient::Status error_update_status;
+  error_update_status.status = UpdateEngineClient::UPDATE_STATUS_ERROR;
+  update_engine_client_->NotifyObserversThatStatusChanged(error_update_status);
+  OobeScreenWaiter(OobeDisplay::SCREEN_ERROR_MESSAGE).Wait();
 }
 
 IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest,

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

@@ -14,6 +14,7 @@
 #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"
@@ -101,11 +102,7 @@ void ResetScreenHandler::Show() {
   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();
@@ -234,7 +231,6 @@ 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;

chromeos/chromeos_switches.cc

@@ -90,9 +90,6 @@ const char kEnableTouchpadThreeFingerClick[]
 // than the kiosk app mode.
 const char kEnableKioskMode[]               = "enable-kiosk-mode";
 
-// Enables rollback option for resetting ChromeOS.
-const char kEnableRollbackOption[]          = "enable-rollback-option";
-
 // Enables request of tablet site (via user agent override).
 const char kEnableRequestTabletSite[]       = "enable-request-tablet-site";
 

chromeos/chromeos_switches.h

@@ -40,7 +40,6 @@ CHROMEOS_EXPORT extern const char kEchoExtensionPath[];
 CHROMEOS_EXPORT extern const char kEnableCarrierSwitching[];
 CHROMEOS_EXPORT extern const char kEnableConsumerManagement[];
 CHROMEOS_EXPORT extern const char kEnableFileManagerMTP[];
-CHROMEOS_EXPORT extern const char kEnableRollbackOption[];
 CHROMEOS_EXPORT extern const char kEnableHIDDetectionOnOOBE[];
 CHROMEOS_EXPORT extern const char kEnableKioskMode[];
 CHROMEOS_EXPORT extern const char kEnableNetworkPortalNotification[];