| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/files/file_path.h" | 6 #include "base/files/file_path.h" |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 "$('add-user-button').click()" | 121 "$('add-user-button').click()" |
| 122 "));")); | 122 "));")); |
| 123 screen_waiter.Wait(); | 123 screen_waiter.Wait(); |
| 124 auth_dialog_waiter.Wait(); | 124 auth_dialog_waiter.Wait(); |
| 125 ASSERT_TRUE(auth_dialog_waiter.login_handler()); | 125 ASSERT_TRUE(auth_dialog_waiter.login_handler()); |
| 126 } | 126 } |
| 127 } | 127 } |
| 128 | 128 |
| 129 INSTANTIATE_TEST_CASE_P(ProxyAuthOnUserBoardScreenTestSuite, | 129 INSTANTIATE_TEST_CASE_P(ProxyAuthOnUserBoardScreenTestSuite, |
| 130 ProxyAuthOnUserBoardScreenTest, | 130 ProxyAuthOnUserBoardScreenTest, |
| 131 // Times out under MSan: https://crbug.com/481651 |
| 132 #if defined(MEMORY_SANITIZER) |
| 133 testing::Values(false)); |
| 134 #else |
| 131 testing::Bool()); | 135 testing::Bool()); |
| 136 #endif |
| 132 | 137 |
| 133 } // namespace chromeos | 138 } // namespace chromeos |
| OLD | NEW |