Rollback option put behind the flag.

chrome/browser/chromeos/login/reset_browsertest.cc

Index: chrome/browser/chromeos/login/reset_browsertest.cc
diff --git a/chrome/browser/chromeos/login/reset_browsertest.cc b/chrome/browser/chromeos/login/reset_browsertest.cc
index 759e8c768b9c6a3fd2a822602e665a190d4725e6..fb4385bcd72e714e6a79758a0fe16b91516b0b83 100644
--- a/chrome/browser/chromeos/login/reset_browsertest.cc
+++ b/chrome/browser/chromeos/login/reset_browsertest.cc
@@ -105,7 +105,9 @@ IN_PROC_BROWSER_TEST_F(ResetTest, ShowAndCancel) {
   JSExpect("!document.querySelector('#reset.hidden')");
   CloseResetScreen();
   JSExpect("!!document.querySelector('#reset.hidden')");
-  EXPECT_EQ(1, update_engine_client_->can_rollback_call_count());
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableRollbackOption))
+    EXPECT_EQ(1, update_engine_client_->can_rollback_call_count());
 }
 
 IN_PROC_BROWSER_TEST_F(ResetTest, PRE_RestartBeforePowerwash) {
@@ -177,15 +179,18 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ShortcutInvokedCases) {
   CloseResetScreen();
   OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait();
 
-  // 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());
+  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());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PRE_PowerwashRequested) {
@@ -220,14 +225,18 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ErrorOnRollbackRequested) {
   EXPECT_EQ(0, update_engine_client_->rollback_call_count());
   JSExpect("!$('reset').classList.contains('revert-promise')");
   ClickResetButton();
-  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();
+  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();
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest,