| 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/shell.h" | 5 #include "ash/shell.h" |
| 6 #include "ash/system/tray/system_tray.h" | 6 #include "ash/system/tray/system_tray.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/json/json_file_value_serializer.h" | 8 #include "base/json/json_file_value_serializer.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 327 TestSystemTrayIsVisible(); | 327 TestSystemTrayIsVisible(); |
| 328 } | 328 } |
| 329 | 329 |
| 330 IN_PROC_BROWSER_TEST_F(LoginTest, PRE_GaiaAuthOffline) { | 330 IN_PROC_BROWSER_TEST_F(LoginTest, PRE_GaiaAuthOffline) { |
| 331 RegisterUser(kTestUser); | 331 RegisterUser(kTestUser); |
| 332 chromeos::StartupUtils::MarkOobeCompleted(); | 332 chromeos::StartupUtils::MarkOobeCompleted(); |
| 333 chromeos::CrosSettings::Get()->SetBoolean( | 333 chromeos::CrosSettings::Get()->SetBoolean( |
| 334 chromeos::kAccountsPrefShowUserNamesOnSignIn, false); | 334 chromeos::kAccountsPrefShowUserNamesOnSignIn, false); |
| 335 } | 335 } |
| 336 | 336 |
| 337 IN_PROC_BROWSER_TEST_F(LoginTest, GaiaAuthOffline) { | 337 #if defined(MEMORY_SANITIZER) |
| 338 #define MAYBE_GaiaAuthOffline DISABLED_GaiaAuthOffline |
| 339 #else |
| 340 #define MAYBE_GaiaAuthOffline GaiaAuthOffline |
| 341 #endif |
| 342 IN_PROC_BROWSER_TEST_F(LoginTest, MAYBE_GaiaAuthOffline) { |
| 338 PrepareOfflineLogin(); | 343 PrepareOfflineLogin(); |
| 339 content::WindowedNotificationObserver session_start_waiter( | 344 content::WindowedNotificationObserver session_start_waiter( |
| 340 chrome::NOTIFICATION_SESSION_STARTED, | 345 chrome::NOTIFICATION_SESSION_STARTED, |
| 341 content::NotificationService::AllSources()); | 346 content::NotificationService::AllSources()); |
| 342 SubmitGaiaAuthOfflineForm(kTestUser, kPassword); | 347 SubmitGaiaAuthOfflineForm(kTestUser, kPassword); |
| 343 session_start_waiter.Wait(); | 348 session_start_waiter.Wait(); |
| 344 | 349 |
| 345 TestSystemTrayIsVisible(); | 350 TestSystemTrayIsVisible(); |
| 346 } | 351 } |
| 347 | 352 |
| 348 } // namespace | 353 } // namespace |
| OLD | NEW |