Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
| 7 #include "base/timer/timer.h" | 7 #include "base/timer/timer.h" |
| 8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
| 9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
| 10 #include "chrome/browser/chromeos/login/login_manager_test.h" | 10 #include "chrome/browser/chromeos/login/login_manager_test.h" |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 136 InitializeForWaiting(animation_waiter.QuitClosure()); | 136 InitializeForWaiting(animation_waiter.QuitClosure()); |
| 137 animation_waiter.Run(); | 137 animation_waiter.Run(); |
| 138 } | 138 } |
| 139 SynchronizeAnimationLoadWithCompositor(); | 139 SynchronizeAnimationLoadWithCompositor(); |
| 140 } | 140 } |
| 141 | 141 |
| 142 class LoginUITest : public chromeos::LoginManagerTest { | 142 class LoginUITest : public chromeos::LoginManagerTest { |
| 143 public: | 143 public: |
| 144 bool enable_test_screenshots_; | 144 bool enable_test_screenshots_; |
| 145 LoginUITest() : LoginManagerTest(false) {} | 145 LoginUITest() : LoginManagerTest(false) {} |
| 146 | |
|
ygorshenin1
2014/07/31 13:19:14
nit: blank line is not needed here.
Lisa Ignatyeva
2014/07/31 16:37:38
Done.
| |
| 146 virtual ~LoginUITest() {} | 147 virtual ~LoginUITest() {} |
| 147 virtual void SetUpOnMainThread() OVERRIDE { | 148 virtual void SetUpOnMainThread() OVERRIDE { |
| 148 enable_test_screenshots_ = screenshot_tester.TryInitialize(); | 149 enable_test_screenshots_ = screenshot_tester.TryInitialize(); |
| 149 if (enable_test_screenshots_) { | 150 if (enable_test_screenshots_) { |
| 150 animation_delay_handler.Initialize(); | 151 animation_delay_handler.Initialize(); |
| 151 } else { | |
| 152 LOG(WARNING) << "Screenshots will not be taken"; | |
| 153 } | 152 } |
| 154 LoginManagerTest::SetUpOnMainThread(); | 153 LoginManagerTest::SetUpOnMainThread(); |
| 155 } | 154 } |
| 156 | 155 |
| 157 protected: | 156 protected: |
| 158 AnimationDelayHandler animation_delay_handler; | 157 AnimationDelayHandler animation_delay_handler; |
| 159 ScreenshotTester screenshot_tester; | 158 ScreenshotTester screenshot_tester; |
| 160 }; | 159 }; |
| 161 | 160 |
| 162 IN_PROC_BROWSER_TEST_F(LoginUITest, PRE_LoginUIVisible) { | 161 IN_PROC_BROWSER_TEST_F(LoginUITest, PRE_LoginUIVisible) { |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 188 prefs->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true); | 187 prefs->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true); |
| 189 } | 188 } |
| 190 | 189 |
| 191 // Tests that the default first screen is the network screen after OOBE | 190 // Tests that the default first screen is the network screen after OOBE |
| 192 // when auto enrollment is enabled and device is not yet enrolled. | 191 // when auto enrollment is enabled and device is not yet enrolled. |
| 193 IN_PROC_BROWSER_TEST_F(LoginUITest, InterruptedAutoStartEnrollment) { | 192 IN_PROC_BROWSER_TEST_F(LoginUITest, InterruptedAutoStartEnrollment) { |
| 194 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_NETWORK).Wait(); | 193 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_NETWORK).Wait(); |
| 195 } | 194 } |
| 196 | 195 |
| 197 } // namespace chromeos | 196 } // namespace chromeos |
| OLD | NEW |