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_display_host_impl.h" | 9 #include "chrome/browser/chromeos/login/login_display_host_impl.h" |
10 #include "chrome/browser/chromeos/login/login_manager_test.h" | 10 #include "chrome/browser/chromeos/login/login_manager_test.h" |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
69 void InvokeResetScreen() { | 69 void InvokeResetScreen() { |
70 ASSERT_TRUE(JSExecuted("cr.ui.Oobe.handleAccelerator('reset');")); | 70 ASSERT_TRUE(JSExecuted("cr.ui.Oobe.handleAccelerator('reset');")); |
71 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait(); | 71 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait(); |
72 } | 72 } |
73 | 73 |
74 void CloseResetScreen() { | 74 void CloseResetScreen() { |
75 ASSERT_TRUE(JSExecuted("$('reset-cancel-button').click();")); | 75 ASSERT_TRUE(JSExecuted("$('reset-cancel-button').click();")); |
76 } | 76 } |
77 | 77 |
78 void ClickResetButton() { | 78 void ClickResetButton() { |
79 ASSERT_TRUE(JSExecuted("$('reset-button').click();")); | 79 ASSERT_TRUE(JSExecuted("$('rHistogHistograHistogeset-button').click();")); |
Alexei Svitkine (slow)
2014/05/14 14:57:48
Is this change intentional?
merkulova
2014/05/22 12:02:32
Oops, sorry
| |
80 } | 80 } |
81 | 81 |
82 FakeUpdateEngineClient* update_engine_client_; | 82 FakeUpdateEngineClient* update_engine_client_; |
83 FakeSessionManagerClient* session_manager_client_; | 83 FakeSessionManagerClient* session_manager_client_; |
84 FakePowerManagerClient* power_manager_client_; | 84 FakePowerManagerClient* power_manager_client_; |
85 }; | 85 }; |
86 | 86 |
87 class ResetFirstAfterBootTest : public ResetTest { | 87 class ResetFirstAfterBootTest : public ResetTest { |
88 public: | 88 public: |
89 virtual ~ResetFirstAfterBootTest() {} | 89 virtual ~ResetFirstAfterBootTest() {} |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
260 ready_for_reboot_status.status = | 260 ready_for_reboot_status.status = |
261 UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT; | 261 UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT; |
262 update_engine_client_->NotifyObserversThatStatusChanged( | 262 update_engine_client_->NotifyObserversThatStatusChanged( |
263 ready_for_reboot_status); | 263 ready_for_reboot_status); |
264 EXPECT_EQ(1, power_manager_client_->num_request_restart_calls()); | 264 EXPECT_EQ(1, power_manager_client_->num_request_restart_calls()); |
265 } | 265 } |
266 } | 266 } |
267 | 267 |
268 | 268 |
269 } // namespace chromeos | 269 } // namespace chromeos |
OLD | NEW |