| 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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 Profile* profile = browser()->profile(); | 202 Profile* profile = browser()->profile(); |
| 203 std::string profile_base_path("hash"); | 203 std::string profile_base_path("hash"); |
| 204 profile_base_path.insert(0, chrome::kProfileDirPrefix); | 204 profile_base_path.insert(0, chrome::kProfileDirPrefix); |
| 205 EXPECT_EQ(profile_base_path, profile->GetPath().BaseName().value()); | 205 EXPECT_EQ(profile_base_path, profile->GetPath().BaseName().value()); |
| 206 EXPECT_FALSE(profile->IsOffTheRecord()); | 206 EXPECT_FALSE(profile->IsOffTheRecord()); |
| 207 | 207 |
| 208 TestSystemTrayIsVisible(); | 208 TestSystemTrayIsVisible(); |
| 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 // Test is flaky https://crbug.com/693106 | 212 IN_PROC_BROWSER_TEST_F(LoginUserTest, CursorShown) { |
| 213 IN_PROC_BROWSER_TEST_F(LoginUserTest, DISABLED_CursorShown) { | |
| 214 EXPECT_TRUE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible()); | 213 EXPECT_TRUE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible()); |
| 215 | 214 |
| 216 TestSystemTrayIsVisible(); | 215 TestSystemTrayIsVisible(); |
| 217 } | 216 } |
| 218 | 217 |
| 219 // After a guest login, we should get the OTR default profile. | 218 // After a guest login, we should get the OTR default profile. |
| 220 IN_PROC_BROWSER_TEST_F(LoginGuestTest, GuestIsOTR) { | 219 IN_PROC_BROWSER_TEST_F(LoginGuestTest, GuestIsOTR) { |
| 221 Profile* profile = browser()->profile(); | 220 Profile* profile = browser()->profile(); |
| 222 EXPECT_TRUE(profile->IsOffTheRecord()); | 221 EXPECT_TRUE(profile->IsOffTheRecord()); |
| 223 // Ensure there's extension service for this profile. | 222 // Ensure there's extension service for this profile. |
| 224 EXPECT_TRUE(extensions::ExtensionSystem::Get(profile)->extension_service()); | 223 EXPECT_TRUE(extensions::ExtensionSystem::Get(profile)->extension_service()); |
| 225 | 224 |
| 226 TestSystemTrayIsVisible(); | 225 TestSystemTrayIsVisible(); |
| 227 } | 226 } |
| 228 | 227 |
| 229 // Verifies the cursor is not hidden at startup when running guest session. | 228 // Verifies the cursor is not hidden at startup when running guest session. |
| 230 IN_PROC_BROWSER_TEST_F(LoginGuestTest, CursorShown) { | 229 // Test is flaky https://crbug.com/693106 |
| 230 IN_PROC_BROWSER_TEST_F(LoginGuestTest, DISABLED_CursorShown) { |
| 231 EXPECT_TRUE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible()); | 231 EXPECT_TRUE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible()); |
| 232 | 232 |
| 233 TestSystemTrayIsVisible(); | 233 TestSystemTrayIsVisible(); |
| 234 } | 234 } |
| 235 | 235 |
| 236 // Verifies the cursor is hidden at startup on login screen. | 236 // Verifies the cursor is hidden at startup on login screen. |
| 237 IN_PROC_BROWSER_TEST_F(LoginCursorTest, CursorHidden) { | 237 IN_PROC_BROWSER_TEST_F(LoginCursorTest, CursorHidden) { |
| 238 // Login screen needs to be shown explicitly when running test. | 238 // Login screen needs to be shown explicitly when running test. |
| 239 ShowLoginWizard(OobeScreen::SCREEN_SPECIAL_LOGIN); | 239 ShowLoginWizard(OobeScreen::SCREEN_SPECIAL_LOGIN); |
| 240 | 240 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 content::WindowedNotificationObserver session_start_waiter( | 272 content::WindowedNotificationObserver session_start_waiter( |
| 273 chrome::NOTIFICATION_SESSION_STARTED, | 273 chrome::NOTIFICATION_SESSION_STARTED, |
| 274 content::NotificationService::AllSources()); | 274 content::NotificationService::AllSources()); |
| 275 SubmitGaiaAuthOfflineForm(kTestUser, kPassword); | 275 SubmitGaiaAuthOfflineForm(kTestUser, kPassword); |
| 276 session_start_waiter.Wait(); | 276 session_start_waiter.Wait(); |
| 277 | 277 |
| 278 TestSystemTrayIsVisible(); | 278 TestSystemTrayIsVisible(); |
| 279 } | 279 } |
| 280 | 280 |
| 281 } // namespace chromeos | 281 } // namespace chromeos |
| OLD | NEW |