| 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 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1154 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) | 1154 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) |
| 1155 | 1155 |
| 1156 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) | 1156 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) |
| 1157 // Flaky on ChromeOS, Linux and Windows (crbug.com/438729) | 1157 // Flaky on ChromeOS, Linux and Windows (crbug.com/438729) |
| 1158 #define MAYBE_MediaStreamAudioTrack DISABLED_MediaStreamAudioTrack | 1158 #define MAYBE_MediaStreamAudioTrack DISABLED_MediaStreamAudioTrack |
| 1159 #else | 1159 #else |
| 1160 #define MAYBE_MediaStreamAudioTrack MediaStreamAudioTrack | 1160 #define MAYBE_MediaStreamAudioTrack MediaStreamAudioTrack |
| 1161 #endif | 1161 #endif |
| 1162 TEST_PPAPI_NACL(MAYBE_MediaStreamAudioTrack) | 1162 TEST_PPAPI_NACL(MAYBE_MediaStreamAudioTrack) |
| 1163 | 1163 |
| 1164 TEST_PPAPI_NACL(MediaStreamVideoTrack) | 1164 #if defined(OS_WIN) |
| 1165 // Flaky on Windows (crbug.com/633519) |
| 1166 #define MAYBE_MediaStreamVideoTrack DISABLED_MediaStreamVideoTrack |
| 1167 #else |
| 1168 #define MAYBE_MediaStreamVideoTrack MediaStreamVideoTrack |
| 1169 #endif |
| 1170 TEST_PPAPI_NACL(MAYBE_MediaStreamVideoTrack) |
| 1165 | 1171 |
| 1166 TEST_PPAPI_NACL(MouseCursor) | 1172 TEST_PPAPI_NACL(MouseCursor) |
| 1167 | 1173 |
| 1168 TEST_PPAPI_NACL(NetworkProxy) | 1174 TEST_PPAPI_NACL(NetworkProxy) |
| 1169 | 1175 |
| 1170 TEST_PPAPI_NACL(TrueTypeFont) | 1176 TEST_PPAPI_NACL(TrueTypeFont) |
| 1171 | 1177 |
| 1172 // TODO(crbug.com/602875), TODO(crbug.com/602876) Flaky on Win and CrOS. | 1178 // TODO(crbug.com/602875), TODO(crbug.com/602876) Flaky on Win and CrOS. |
| 1173 #if defined(OS_CHROMEOS) || defined(OS_WIN) | 1179 #if defined(OS_CHROMEOS) || defined(OS_WIN) |
| 1174 #define MAYBE_VideoDecoder DISABLED_VideoDecoder | 1180 #define MAYBE_VideoDecoder DISABLED_VideoDecoder |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1314 MAYBE_PPAPI_NACL(NoSocketPermissions)) { | 1320 MAYBE_PPAPI_NACL(NoSocketPermissions)) { |
| 1315 RunTests("no_socket_permissions"); | 1321 RunTests("no_socket_permissions"); |
| 1316 } | 1322 } |
| 1317 | 1323 |
| 1318 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1324 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
| 1319 MAYBE_PPAPI_NACL(SocketPermissions)) { | 1325 MAYBE_PPAPI_NACL(SocketPermissions)) { |
| 1320 RunTests("socket_permissions"); | 1326 RunTests("socket_permissions"); |
| 1321 } | 1327 } |
| 1322 | 1328 |
| 1323 #endif | 1329 #endif |
| OLD | NEW |