| 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 "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 1141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1152 #define MAYBE_Compositor1 DISABLED_Compositor1 | 1152 #define MAYBE_Compositor1 DISABLED_Compositor1 |
| 1153 #else | 1153 #else |
| 1154 // flaky on Linux: http://crbug.com/396482 | 1154 // flaky on Linux: http://crbug.com/396482 |
| 1155 #define MAYBE_Compositor0 DISABLED_Compositor0 | 1155 #define MAYBE_Compositor0 DISABLED_Compositor0 |
| 1156 #define MAYBE_Compositor1 DISABLED_Compositor1 | 1156 #define MAYBE_Compositor1 DISABLED_Compositor1 |
| 1157 #endif | 1157 #endif |
| 1158 | 1158 |
| 1159 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) | 1159 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) |
| 1160 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) | 1160 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) |
| 1161 | 1161 |
| 1162 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) | 1162 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || \ |
| 1163 // Flaky on ChromeOS, Linux and Windows (crbug.com/438729) | 1163 defined(OS_MACOSX) |
| 1164 // Flaky on ChromeOS, Linux, Windows, and Mac (crbug.com/438729) |
| 1164 #define MAYBE_MediaStreamAudioTrack DISABLED_MediaStreamAudioTrack | 1165 #define MAYBE_MediaStreamAudioTrack DISABLED_MediaStreamAudioTrack |
| 1165 #else | 1166 #else |
| 1166 #define MAYBE_MediaStreamAudioTrack MediaStreamAudioTrack | 1167 #define MAYBE_MediaStreamAudioTrack MediaStreamAudioTrack |
| 1167 #endif | 1168 #endif |
| 1168 TEST_PPAPI_NACL(MAYBE_MediaStreamAudioTrack) | 1169 TEST_PPAPI_NACL(MAYBE_MediaStreamAudioTrack) |
| 1169 | 1170 |
| 1170 #if defined(OS_WIN) | 1171 #if defined(OS_WIN) |
| 1171 // Flaky on Windows (crbug.com/633519) | 1172 // Flaky on Windows (crbug.com/633519) |
| 1172 #define MAYBE_MediaStreamVideoTrack DISABLED_MediaStreamVideoTrack | 1173 #define MAYBE_MediaStreamVideoTrack DISABLED_MediaStreamVideoTrack |
| 1173 #else | 1174 #else |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1326 MAYBE_PPAPI_NACL(NoSocketPermissions)) { | 1327 MAYBE_PPAPI_NACL(NoSocketPermissions)) { |
| 1327 RunTests("no_socket_permissions"); | 1328 RunTests("no_socket_permissions"); |
| 1328 } | 1329 } |
| 1329 | 1330 |
| 1330 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1331 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
| 1331 MAYBE_PPAPI_NACL(SocketPermissions)) { | 1332 MAYBE_PPAPI_NACL(SocketPermissions)) { |
| 1332 RunTests("socket_permissions"); | 1333 RunTests("socket_permissions"); |
| 1333 } | 1334 } |
| 1334 | 1335 |
| 1335 #endif | 1336 #endif |
| OLD | NEW |