| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/common/shelf/wm_shelf.h" | 7 #include "ash/common/shelf/wm_shelf.h" |
| 8 #include "ash/common/system/tray/system_tray.h" | 8 #include "ash/common/system/tray/system_tray.h" |
| 9 #include "ash/common/wm_window.h" | 9 #include "ash/common/wm_window.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 } | 209 } |
| 210 | 210 |
| 211 // Verifies the cursor is not hidden at startup when user is logged in. | 211 // Verifies the cursor is not hidden at startup when user is logged in. |
| 212 IN_PROC_BROWSER_TEST_F(LoginUserTest, CursorShown) { | 212 IN_PROC_BROWSER_TEST_F(LoginUserTest, CursorShown) { |
| 213 EXPECT_TRUE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible()); | 213 EXPECT_TRUE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible()); |
| 214 | 214 |
| 215 TestSystemTrayIsVisible(); | 215 TestSystemTrayIsVisible(); |
| 216 } | 216 } |
| 217 | 217 |
| 218 // After a guest login, we should get the OTR default profile. | 218 // After a guest login, we should get the OTR default profile. |
| 219 IN_PROC_BROWSER_TEST_F(LoginGuestTest, GuestIsOTR) { | 219 // Test is flaky https://crbug.com/693106 |
| 220 IN_PROC_BROWSER_TEST_F(LoginGuestTest, DISABLED_GuestIsOTR) { |
| 220 Profile* profile = browser()->profile(); | 221 Profile* profile = browser()->profile(); |
| 221 EXPECT_TRUE(profile->IsOffTheRecord()); | 222 EXPECT_TRUE(profile->IsOffTheRecord()); |
| 222 // Ensure there's extension service for this profile. | 223 // Ensure there's extension service for this profile. |
| 223 EXPECT_TRUE(extensions::ExtensionSystem::Get(profile)->extension_service()); | 224 EXPECT_TRUE(extensions::ExtensionSystem::Get(profile)->extension_service()); |
| 224 | 225 |
| 225 TestSystemTrayIsVisible(); | 226 TestSystemTrayIsVisible(); |
| 226 } | 227 } |
| 227 | 228 |
| 228 // Verifies the cursor is not hidden at startup when running guest session. | 229 // Verifies the cursor is not hidden at startup when running guest session. |
| 229 // Test is flaky https://crbug.com/693106 | 230 // Test is flaky https://crbug.com/693106 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 content::WindowedNotificationObserver session_start_waiter( | 273 content::WindowedNotificationObserver session_start_waiter( |
| 273 chrome::NOTIFICATION_SESSION_STARTED, | 274 chrome::NOTIFICATION_SESSION_STARTED, |
| 274 content::NotificationService::AllSources()); | 275 content::NotificationService::AllSources()); |
| 275 SubmitGaiaAuthOfflineForm(kTestUser, kPassword); | 276 SubmitGaiaAuthOfflineForm(kTestUser, kPassword); |
| 276 session_start_waiter.Wait(); | 277 session_start_waiter.Wait(); |
| 277 | 278 |
| 278 TestSystemTrayIsVisible(); | 279 TestSystemTrayIsVisible(); |
| 279 } | 280 } |
| 280 | 281 |
| 281 } // namespace chromeos | 282 } // namespace chromeos |
| OLD | NEW |