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 "chrome/test/ppapi/ppapi_test.h" | 5 #include "chrome/test/ppapi/ppapi_test.h" |
6 | 6 |
7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "chrome/browser/content_settings/host_content_settings_map.h" | 9 #include "chrome/browser/content_settings/host_content_settings_map.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
305 | 305 |
306 // UDPSocket tests. | 306 // UDPSocket tests. |
307 // UDPSocket_Broadcast is disabled for OSX because it requires root | 307 // UDPSocket_Broadcast is disabled for OSX because it requires root |
308 // permissions on OSX 10.7+. | 308 // permissions on OSX 10.7+. |
309 #if defined(OS_MACOSX) | 309 #if defined(OS_MACOSX) |
310 #define MAYBE_UDPSocket_Broadcast DISABLED_UDPSocket_Broadcast | 310 #define MAYBE_UDPSocket_Broadcast DISABLED_UDPSocket_Broadcast |
311 #else | 311 #else |
312 #define MAYBE_UDPSocket_Broadcast UDPSocket_Broadcast | 312 #define MAYBE_UDPSocket_Broadcast UDPSocket_Broadcast |
313 #endif | 313 #endif |
314 | 314 |
315 #define RUN_UDPSOCKET_SUBTESTS \ | 315 #define RUN_UDPSOCKET_SUBTESTS \ |
316 RunTestViaHTTP( \ | 316 RunTestViaHTTP(LIST_TEST(UDPSocket_ReadWrite) LIST_TEST(UDPSocket_SetOption) \ |
317 LIST_TEST(UDPSocket_ReadWrite) \ | 317 LIST_TEST(MAYBE_UDPSocket_Broadcast) \ |
318 LIST_TEST(UDPSocket_SetOption) \ | 318 LIST_TEST(UDPSocket_ParallelSend)) |
dmichael (off chromium)
2014/10/08 17:20:46
clang format?
That's unfortunate, but I guess it'
bbudge
2014/10/08 21:44:35
I'm fix this manually.
| |
319 LIST_TEST(MAYBE_UDPSocket_Broadcast) \ | |
320 ) | |
321 | 319 |
322 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, UDPSocket) { | 320 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, UDPSocket) { |
323 RUN_UDPSOCKET_SUBTESTS; | 321 RUN_UDPSOCKET_SUBTESTS; |
324 } | 322 } |
325 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, UDPSocket) { | 323 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, UDPSocket) { |
326 RUN_UDPSOCKET_SUBTESTS; | 324 RUN_UDPSOCKET_SUBTESTS; |
327 } | 325 } |
328 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(UDPSocket)) { | 326 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(UDPSocket)) { |
329 RUN_UDPSOCKET_SUBTESTS; | 327 RUN_UDPSOCKET_SUBTESTS; |
330 } | 328 } |
(...skipping 990 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1321 LIST_TEST(FlashDRM_GetHmonitor) | 1319 LIST_TEST(FlashDRM_GetHmonitor) |
1322 LIST_TEST(FlashDRM_GetVoucherFile)); | 1320 LIST_TEST(FlashDRM_GetVoucherFile)); |
1323 } | 1321 } |
1324 | 1322 |
1325 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1323 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
1326 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1324 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
1327 | 1325 |
1328 #if defined(OS_CHROMEOS) | 1326 #if defined(OS_CHROMEOS) |
1329 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1327 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
1330 #endif | 1328 #endif |
OLD | NEW |