Chromium Code Reviews| 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/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 54 scoped_ptr<PowerManagerClient>(power_manager_client_)); | 54 scoped_ptr<PowerManagerClient>(power_manager_client_)); |
| 55 update_engine_client_ = new FakeUpdateEngineClient; | 55 update_engine_client_ = new FakeUpdateEngineClient; |
| 56 dbus_setter->SetUpdateEngineClient( | 56 dbus_setter->SetUpdateEngineClient( |
| 57 scoped_ptr<UpdateEngineClient>(update_engine_client_)); | 57 scoped_ptr<UpdateEngineClient>(update_engine_client_)); |
| 58 | 58 |
| 59 LoginManagerTest::SetUpInProcessBrowserTestFixture(); | 59 LoginManagerTest::SetUpInProcessBrowserTestFixture(); |
| 60 } | 60 } |
| 61 | 61 |
| 62 void RegisterSomeUser() { | 62 void RegisterSomeUser() { |
| 63 RegisterUser(kTestUser1); | 63 RegisterUser(kTestUser1); |
| 64 LOG(ERROR) << "1"; | |
|
dzhioev (left Google)
2015/02/11 12:38:29
Remove this.
merkulova
2015/02/11 15:07:17
Done.
merkulova
2015/02/11 15:07:17
Done.
| |
| 64 StartupUtils::MarkOobeCompleted(); | 65 StartupUtils::MarkOobeCompleted(); |
| 65 } | 66 } |
| 66 | 67 |
| 67 bool JSExecuted(const std::string& script) { | 68 bool JSExecuted(const std::string& script) { |
| 68 return content::ExecuteScript(web_contents(), script); | 69 return content::ExecuteScript(web_contents(), script); |
| 69 } | 70 } |
| 70 | 71 |
| 71 void InvokeResetScreen() { | 72 void InvokeResetScreen() { |
| 72 ASSERT_TRUE(JSExecuted("cr.ui.Oobe.handleAccelerator('reset');")); | 73 ASSERT_TRUE(JSExecuted("cr.ui.Oobe.handleAccelerator('reset');")); |
| 73 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait(); | 74 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait(); |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 328 InvokeRollbackOption(); | 329 InvokeRollbackOption(); |
| 329 JSExpect("$('reset').classList.contains('rollback-proposal-view')"); | 330 JSExpect("$('reset').classList.contains('rollback-proposal-view')"); |
| 330 CloseResetScreen(); | 331 CloseResetScreen(); |
| 331 InvokeResetScreen(); | 332 InvokeResetScreen(); |
| 332 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait(); | 333 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait(); |
| 333 InvokeRollbackOption(); | 334 InvokeRollbackOption(); |
| 334 JSExpect("$('reset').classList.contains('rollback-proposal-view')"); | 335 JSExpect("$('reset').classList.contains('rollback-proposal-view')"); |
| 335 } | 336 } |
| 336 | 337 |
| 337 } // namespace chromeos | 338 } // namespace chromeos |
| OLD | NEW |