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/threading/thread_restrictions.h" | 10 #include "base/threading/thread_restrictions.h" |
(...skipping 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1174 #define MAYBE_MediaStreamVideoTrack DISABLED_MediaStreamVideoTrack | 1174 #define MAYBE_MediaStreamVideoTrack DISABLED_MediaStreamVideoTrack |
1175 #else | 1175 #else |
1176 #define MAYBE_MediaStreamVideoTrack MediaStreamVideoTrack | 1176 #define MAYBE_MediaStreamVideoTrack MediaStreamVideoTrack |
1177 #endif | 1177 #endif |
1178 TEST_PPAPI_NACL(MAYBE_MediaStreamVideoTrack) | 1178 TEST_PPAPI_NACL(MAYBE_MediaStreamVideoTrack) |
1179 | 1179 |
1180 TEST_PPAPI_NACL(MouseCursor) | 1180 TEST_PPAPI_NACL(MouseCursor) |
1181 | 1181 |
1182 TEST_PPAPI_NACL(NetworkProxy) | 1182 TEST_PPAPI_NACL(NetworkProxy) |
1183 | 1183 |
1184 TEST_PPAPI_NACL(TrueTypeFont) | 1184 // Doesn't work in GN CrOS ozone builds yet, http://crbug.com/619765 |
sky
2017/05/03 04:42:38
Minor comment. Please use TODO, e.g.:
// TODO: get
kylechar
2017/05/03 13:39:47
Done.
| |
1185 #if defined(OS_CHROMEOS) && defined(USE_OZONE) | |
1186 #define MAYBE_TrueTypeFont DISABLED_TrueTypeFont | |
1187 #else | |
1188 #define MAYBE_TrueTypeFont TrueTypeFont | |
1189 #endif | |
1190 TEST_PPAPI_NACL(MAYBE_TrueTypeFont) | |
1185 | 1191 |
1186 // TODO(crbug.com/602875), TODO(crbug.com/602876) Flaky on Win and CrOS. | 1192 // TODO(crbug.com/602875), TODO(crbug.com/602876) Flaky on Win and CrOS. |
1187 #if defined(OS_CHROMEOS) || defined(OS_WIN) | 1193 #if defined(OS_CHROMEOS) || defined(OS_WIN) |
1188 #define MAYBE_VideoDecoder DISABLED_VideoDecoder | 1194 #define MAYBE_VideoDecoder DISABLED_VideoDecoder |
1189 #else | 1195 #else |
1190 #define MAYBE_VideoDecoder VideoDecoder | 1196 #define MAYBE_VideoDecoder VideoDecoder |
1191 #endif | 1197 #endif |
1192 TEST_PPAPI_NACL(MAYBE_VideoDecoder) | 1198 TEST_PPAPI_NACL(MAYBE_VideoDecoder) |
1193 | 1199 |
1194 TEST_PPAPI_NACL(VideoEncoder) | 1200 TEST_PPAPI_NACL(VideoEncoder) |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1337 MAYBE_PPAPI_NACL(NoSocketPermissions)) { | 1343 MAYBE_PPAPI_NACL(NoSocketPermissions)) { |
1338 RunTests("no_socket_permissions"); | 1344 RunTests("no_socket_permissions"); |
1339 } | 1345 } |
1340 | 1346 |
1341 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1347 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
1342 MAYBE_PPAPI_NACL(SocketPermissions)) { | 1348 MAYBE_PPAPI_NACL(SocketPermissions)) { |
1343 RunTests("socket_permissions"); | 1349 RunTests("socket_permissions"); |
1344 } | 1350 } |
1345 | 1351 |
1346 #endif | 1352 #endif |
OLD | NEW |