Rollback feature is taken out of 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_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
@@ skipping 22 matching lines @@
  public:
   ResetTest() : LoginManagerTest(false),
       update_engine_client_(NULL),
       session_manager_client_(NULL),
       power_manager_client_(NULL) {
   }
   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 {
     scoped_ptr<DBusThreadManagerSetter> dbus_setter =
         chromeos::DBusThreadManager::GetSetterForTesting();
     session_manager_client_ = new FakeSessionManagerClient;
     dbus_setter->SetSessionManagerClient(
         scoped_ptr<SessionManagerClient>(session_manager_client_));
     power_manager_client_ = new FakePowerManagerClient;
@@ skipping 44 matching lines @@
   FakePowerManagerClient* power_manager_client_;
 };
 
 class ResetFirstAfterBootTest : public ResetTest {
  public:
   virtual ~ResetFirstAfterBootTest() {}
 
   virtual void SetUpCommandLine(base::CommandLine* command_line) override {
     LoginManagerTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kFirstExecAfterBoot);
-    command_line->AppendSwitch(switches::kEnableRollbackOption);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ResetTest, PRE_ShowAndCancel) {
   RegisterSomeUser();
 }
 
 IN_PROC_BROWSER_TEST_F(ResetTest, ShowAndCancel) {
   JSExpect("!!document.querySelector('#reset.hidden')");
   InvokeResetScreen();
@@ skipping 133 matching lines @@
   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