| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
| 9 #include "chrome/browser/chromeos/login/login_manager_test.h" | 9 #include "chrome/browser/chromeos/login/login_manager_test.h" |
| 10 #include "chrome/browser/chromeos/login/startup_utils.h" | 10 #include "chrome/browser/chromeos/login/startup_utils.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 power_manager_client_(NULL) { | 38 power_manager_client_(NULL) { |
| 39 } | 39 } |
| 40 ~ResetTest() override {} | 40 ~ResetTest() override {} |
| 41 | 41 |
| 42 void SetUpCommandLine(base::CommandLine* command_line) override { | 42 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 43 LoginManagerTest::SetUpCommandLine(command_line); | 43 LoginManagerTest::SetUpCommandLine(command_line); |
| 44 } | 44 } |
| 45 | 45 |
| 46 // LoginManagerTest overrides: | 46 // LoginManagerTest overrides: |
| 47 void SetUpInProcessBrowserTestFixture() override { | 47 void SetUpInProcessBrowserTestFixture() override { |
| 48 scoped_ptr<DBusThreadManagerSetter> dbus_setter = | 48 std::unique_ptr<DBusThreadManagerSetter> dbus_setter = |
| 49 chromeos::DBusThreadManager::GetSetterForTesting(); | 49 chromeos::DBusThreadManager::GetSetterForTesting(); |
| 50 session_manager_client_ = new FakeSessionManagerClient; | 50 session_manager_client_ = new FakeSessionManagerClient; |
| 51 dbus_setter->SetSessionManagerClient( | 51 dbus_setter->SetSessionManagerClient( |
| 52 scoped_ptr<SessionManagerClient>(session_manager_client_)); | 52 std::unique_ptr<SessionManagerClient>(session_manager_client_)); |
| 53 power_manager_client_ = new FakePowerManagerClient; | 53 power_manager_client_ = new FakePowerManagerClient; |
| 54 dbus_setter->SetPowerManagerClient( | 54 dbus_setter->SetPowerManagerClient( |
| 55 scoped_ptr<PowerManagerClient>(power_manager_client_)); | 55 std::unique_ptr<PowerManagerClient>(power_manager_client_)); |
| 56 update_engine_client_ = new FakeUpdateEngineClient; | 56 update_engine_client_ = new FakeUpdateEngineClient; |
| 57 dbus_setter->SetUpdateEngineClient( | 57 dbus_setter->SetUpdateEngineClient( |
| 58 scoped_ptr<UpdateEngineClient>(update_engine_client_)); | 58 std::unique_ptr<UpdateEngineClient>(update_engine_client_)); |
| 59 | 59 |
| 60 LoginManagerTest::SetUpInProcessBrowserTestFixture(); | 60 LoginManagerTest::SetUpInProcessBrowserTestFixture(); |
| 61 } | 61 } |
| 62 | 62 |
| 63 void RegisterSomeUser() { | 63 void RegisterSomeUser() { |
| 64 RegisterUser(kTestUser1); | 64 RegisterUser(kTestUser1); |
| 65 StartupUtils::MarkOobeCompleted(); | 65 StartupUtils::MarkOobeCompleted(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 bool JSExecuted(const std::string& script) { | 68 bool JSExecuted(const std::string& script) { |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 InvokeRollbackOption(); | 329 InvokeRollbackOption(); |
| 330 JSExpect("$('reset').classList.contains('rollback-proposal-view')"); | 330 JSExpect("$('reset').classList.contains('rollback-proposal-view')"); |
| 331 CloseResetScreen(); | 331 CloseResetScreen(); |
| 332 InvokeResetScreen(); | 332 InvokeResetScreen(); |
| 333 OobeScreenWaiter(OobeScreen::SCREEN_OOBE_RESET).Wait(); | 333 OobeScreenWaiter(OobeScreen::SCREEN_OOBE_RESET).Wait(); |
| 334 InvokeRollbackOption(); | 334 InvokeRollbackOption(); |
| 335 JSExpect("$('reset').classList.contains('rollback-proposal-view')"); | 335 JSExpect("$('reset').classList.contains('rollback-proposal-view')"); |
| 336 } | 336 } |
| 337 | 337 |
| 338 } // namespace chromeos | 338 } // namespace chromeos |
| OLD | NEW |