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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/test/test_timeouts.h" | 9 #include "base/test/test_timeouts.h" |
10 #include "base/win/windows_version.h" | 10 #include "base/win/windows_version.h" |
(...skipping 1087 matching lines...) Loading... |
1098 } | 1098 } |
1099 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, MAYBE_PNACL_NONSFI(View)) { | 1099 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, MAYBE_PNACL_NONSFI(View)) { |
1100 RUN_VIEW_SUBTESTS; | 1100 RUN_VIEW_SUBTESTS; |
1101 } | 1101 } |
1102 | 1102 |
1103 // FlashMessageLoop tests. | 1103 // FlashMessageLoop tests. |
1104 #define RUN_FLASH_MESSAGE_LOOP_SUBTESTS \ | 1104 #define RUN_FLASH_MESSAGE_LOOP_SUBTESTS \ |
1105 RunTest( \ | 1105 RunTest( \ |
1106 LIST_TEST(FlashMessageLoop_Basics) \ | 1106 LIST_TEST(FlashMessageLoop_Basics) \ |
1107 LIST_TEST(FlashMessageLoop_RunWithoutQuit) \ | 1107 LIST_TEST(FlashMessageLoop_RunWithoutQuit) \ |
| 1108 LIST_TEST(FlashMessageLoop_SuspendScriptCallbackWhileRunning) \ |
1108 ) | 1109 ) |
1109 | 1110 |
1110 #if defined(OS_LINUX) // Disabled due to flakiness http://crbug.com/316925 | 1111 #if defined(OS_LINUX) // Disabled due to flakiness http://crbug.com/316925 |
1111 #define MAYBE_FlashMessageLoop DISABLED_FlashMessageLoop | 1112 #define MAYBE_FlashMessageLoop DISABLED_FlashMessageLoop |
1112 #else | 1113 #else |
1113 #define MAYBE_FlashMessageLoop FlashMessageLoop | 1114 #define MAYBE_FlashMessageLoop FlashMessageLoop |
1114 #endif | 1115 #endif |
1115 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { | 1116 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { |
1116 RUN_FLASH_MESSAGE_LOOP_SUBTESTS; | 1117 RUN_FLASH_MESSAGE_LOOP_SUBTESTS; |
1117 } | 1118 } |
(...skipping 191 matching lines...) Loading... |
1309 MAYBE_PPAPI_NACL(NoSocketPermissions)) { | 1310 MAYBE_PPAPI_NACL(NoSocketPermissions)) { |
1310 RunTests("no_socket_permissions"); | 1311 RunTests("no_socket_permissions"); |
1311 } | 1312 } |
1312 | 1313 |
1313 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1314 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
1314 MAYBE_PPAPI_NACL(SocketPermissions)) { | 1315 MAYBE_PPAPI_NACL(SocketPermissions)) { |
1315 RunTests("socket_permissions"); | 1316 RunTests("socket_permissions"); |
1316 } | 1317 } |
1317 | 1318 |
1318 #endif | 1319 #endif |
OLD | NEW |