Revert of Rollback option put behind the flag.

chrome/browser/chromeos/login/reset_browsertest.cc

 // Copyright 2014 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 <string>
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
@@ skipping 87 matching lines @@
   RegisterSomeUser();
 }
 
 IN_PROC_BROWSER_TEST_F(ResetTest, ShowAndCancel) {
   JSExpect("!!document.querySelector('#reset.hidden')");
   EXPECT_EQ(0, update_engine_client_->can_rollback_call_count());
   InvokeResetScreen();
   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) {
   RegisterSomeUser();
 }
 
 IN_PROC_BROWSER_TEST_F(ResetTest, RestartBeforePowerwash) {
   PrefService* prefs = g_browser_process->local_state();
 
   InvokeResetScreen();
@@ skipping 51 matching lines @@
   update_engine_client_->set_can_rollback_check_result(true);
   // rollback available and unchecked
   InvokeResetScreen();
   ClickResetButton();
   EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
   EXPECT_EQ(2, session_manager_client_->start_device_wipe_call_count());
   EXPECT_EQ(0, update_engine_client_->rollback_call_count());
   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) {
   PrefService* prefs = g_browser_process->local_state();
   prefs->SetBoolean(prefs::kRollbackRequested, false);
   prefs->SetBoolean(prefs::kFactoryResetRequested, true);
   RegisterSomeUser();
 }
 
 IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PowerwashRequested) {
@@ skipping 14 matching lines @@
   RegisterSomeUser();
 }
 
 IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ErrorOnRollbackRequested) {
   OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait();
   EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
   EXPECT_EQ(0, session_manager_client_->start_device_wipe_call_count());
   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,
                        PRE_SuccessOnRollbackRequested) {
   PrefService* prefs = g_browser_process->local_state();
   prefs->SetBoolean(prefs::kRollbackRequested, true);
   prefs->SetBoolean(prefs::kFactoryResetRequested, true);
   RegisterSomeUser();
 }
 
 IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, SuccessOnRollbackRequested) {
   OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait();
   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());
   UpdateEngineClient::Status ready_for_reboot_status;
   ready_for_reboot_status.status =
       UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT;
   update_engine_client_->NotifyObserversThatStatusChanged(
       ready_for_reboot_status);
   EXPECT_EQ(1, power_manager_client_->num_request_restart_calls());
 }
 
 
 }  // namespace chromeos