| 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 "ash/common/system/tray/system_tray.h" | 5 #include "ash/common/system/tray/system_tray.h" |
| 6 #include "ash/shell.h" | 6 #include "ash/shell.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 .Wait(); | 247 .Wait(); |
| 248 } | 248 } |
| 249 | 249 |
| 250 | 250 |
| 251 IN_PROC_BROWSER_TEST_F(LoginTest, PRE_GaiaAuthOffline) { | 251 IN_PROC_BROWSER_TEST_F(LoginTest, PRE_GaiaAuthOffline) { |
| 252 RegisterUser(kTestUser); | 252 RegisterUser(kTestUser); |
| 253 StartupUtils::MarkOobeCompleted(); | 253 StartupUtils::MarkOobeCompleted(); |
| 254 CrosSettings::Get()->SetBoolean(kAccountsPrefShowUserNamesOnSignIn, false); | 254 CrosSettings::Get()->SetBoolean(kAccountsPrefShowUserNamesOnSignIn, false); |
| 255 } | 255 } |
| 256 | 256 |
| 257 IN_PROC_BROWSER_TEST_F(LoginTest, GaiaAuthOffline) { | 257 // Flaky, see http://crbug/692364. |
| 258 IN_PROC_BROWSER_TEST_F(LoginTest, DISABLED_GaiaAuthOffline) { |
| 258 PrepareOfflineLogin(); | 259 PrepareOfflineLogin(); |
| 259 content::WindowedNotificationObserver session_start_waiter( | 260 content::WindowedNotificationObserver session_start_waiter( |
| 260 chrome::NOTIFICATION_SESSION_STARTED, | 261 chrome::NOTIFICATION_SESSION_STARTED, |
| 261 content::NotificationService::AllSources()); | 262 content::NotificationService::AllSources()); |
| 262 SubmitGaiaAuthOfflineForm(kTestUser, kPassword); | 263 SubmitGaiaAuthOfflineForm(kTestUser, kPassword); |
| 263 session_start_waiter.Wait(); | 264 session_start_waiter.Wait(); |
| 264 | 265 |
| 265 TestSystemTrayIsVisible(); | 266 TestSystemTrayIsVisible(); |
| 266 } | 267 } |
| 267 | 268 |
| 268 } // namespace chromeos | 269 } // namespace chromeos |
| OLD | NEW |