Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / reset_browsertest.cc

diff --git a/src/chrome/browser/chromeos/login/reset_browsertest.cc b/src/chrome/browser/chromeos/login/reset_browsertest.cc
index 90c8637..89eb85a 100644 (file)
--- a/src/chrome/browser/chromeos/login/reset_browsertest.cc
+++ b/src/chrome/browser/chromeos/login/reset_browsertest.cc
@@ -39,6 +39,11 @@ class ResetTest : public LoginManagerTest {
   }
   virtual ~ResetTest() {}
 
+  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
+    LoginManagerTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kEnableRollbackOption);
+  }
+
   // LoginManagerTest overrides:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     FakeDBusThreadManager* dbus_manager = new FakeDBusThreadManager;
@@ -91,6 +96,7 @@ class ResetFirstAfterBootTest : public ResetTest {
   virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
     LoginManagerTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kFirstExecAfterBoot);
+    command_line->AppendSwitch(switches::kEnableRollbackOption);
   }
 };
 
@@ -105,10 +111,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) {
@@ -180,18 +183,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) {
@@ -226,18 +226,15 @@ 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,
@@ -249,20 +246,17 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest,
 }
 
 IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, SuccessOnRollbackRequested) {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableRollbackOption)) {
-    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());
-  }
+  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());
 }