| 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 "base/path_service.h" | 5 #include "base/path_service.h" |
| 6 #include "base/test/test_timeouts.h" | 6 #include "base/test/test_timeouts.h" |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "chrome/browser/extensions/extension_browsertest.h" | 8 #include "chrome/browser/extensions/extension_browsertest.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 #define MAYBE_UDPSocket_Broadcast DISABLED_UDPSocket_Broadcast | 348 #define MAYBE_UDPSocket_Broadcast DISABLED_UDPSocket_Broadcast |
| 349 #else | 349 #else |
| 350 #define MAYBE_UDPSocket_Broadcast UDPSocket_Broadcast | 350 #define MAYBE_UDPSocket_Broadcast UDPSocket_Broadcast |
| 351 #endif | 351 #endif |
| 352 | 352 |
| 353 #define RUN_UDPSOCKET_SUBTESTS \ | 353 #define RUN_UDPSOCKET_SUBTESTS \ |
| 354 RunTestViaHTTP( \ | 354 RunTestViaHTTP( \ |
| 355 LIST_TEST(UDPSocket_ReadWrite) \ | 355 LIST_TEST(UDPSocket_ReadWrite) \ |
| 356 LIST_TEST(UDPSocket_SetOption) \ | 356 LIST_TEST(UDPSocket_SetOption) \ |
| 357 LIST_TEST(MAYBE_UDPSocket_Broadcast) \ | 357 LIST_TEST(MAYBE_UDPSocket_Broadcast) \ |
| 358 LIST_TEST(UDPSocket_Multicast) \ |
| 358 ) | 359 ) |
| 359 | 360 |
| 360 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, UDPSocket) { | 361 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, UDPSocket) { |
| 361 RUN_UDPSOCKET_SUBTESTS; | 362 RUN_UDPSOCKET_SUBTESTS; |
| 362 } | 363 } |
| 363 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, UDPSocket) { | 364 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, UDPSocket) { |
| 364 RUN_UDPSOCKET_SUBTESTS; | 365 RUN_UDPSOCKET_SUBTESTS; |
| 365 } | 366 } |
| 366 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(UDPSocket)) { | 367 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(UDPSocket)) { |
| 367 RUN_UDPSOCKET_SUBTESTS; | 368 RUN_UDPSOCKET_SUBTESTS; |
| (...skipping 13 matching lines...) Expand all Loading... |
| 381 | 382 |
| 382 // UDPSocketPrivate tests. | 383 // UDPSocketPrivate tests. |
| 383 // UDPSocketPrivate_Broadcast is disabled for OSX because it requires root | 384 // UDPSocketPrivate_Broadcast is disabled for OSX because it requires root |
| 384 // permissions on OSX 10.7+. | 385 // permissions on OSX 10.7+. |
| 385 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_Connect) | 386 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_Connect) |
| 386 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_ConnectFailure) | 387 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_ConnectFailure) |
| 387 #if !defined(OS_MACOSX) | 388 #if !defined(OS_MACOSX) |
| 388 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_Broadcast) | 389 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_Broadcast) |
| 389 #endif // !defined(OS_MACOSX) | 390 #endif // !defined(OS_MACOSX) |
| 390 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_SetSocketFeatureErrors) | 391 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_SetSocketFeatureErrors) |
| 392 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_Multicast) |
| 391 TEST_PPAPI_NACL(UDPSocketPrivate_Connect) | 393 TEST_PPAPI_NACL(UDPSocketPrivate_Connect) |
| 392 TEST_PPAPI_NACL(UDPSocketPrivate_ConnectFailure) | 394 TEST_PPAPI_NACL(UDPSocketPrivate_ConnectFailure) |
| 393 #if !defined(OS_MACOSX) | 395 #if !defined(OS_MACOSX) |
| 394 TEST_PPAPI_NACL(UDPSocketPrivate_Broadcast) | 396 TEST_PPAPI_NACL(UDPSocketPrivate_Broadcast) |
| 395 #endif // !defined(OS_MACOSX) | 397 #endif // !defined(OS_MACOSX) |
| 396 TEST_PPAPI_NACL(UDPSocketPrivate_SetSocketFeatureErrors) | 398 TEST_PPAPI_NACL(UDPSocketPrivate_SetSocketFeatureErrors) |
| 399 TEST_PPAPI_NACL(UDPSocketPrivate_Multicast) |
| 397 | 400 |
| 398 // Disallowed socket tests. | 401 // Disallowed socket tests. |
| 399 TEST_PPAPI_NACL_DISALLOWED_SOCKETS(HostResolverPrivateDisallowed) | 402 TEST_PPAPI_NACL_DISALLOWED_SOCKETS(HostResolverPrivateDisallowed) |
| 400 TEST_PPAPI_NACL_DISALLOWED_SOCKETS(TCPServerSocketPrivateDisallowed) | 403 TEST_PPAPI_NACL_DISALLOWED_SOCKETS(TCPServerSocketPrivateDisallowed) |
| 401 TEST_PPAPI_NACL_DISALLOWED_SOCKETS(TCPSocketPrivateDisallowed) | 404 TEST_PPAPI_NACL_DISALLOWED_SOCKETS(TCPSocketPrivateDisallowed) |
| 402 TEST_PPAPI_NACL_DISALLOWED_SOCKETS(UDPSocketPrivateDisallowed) | 405 TEST_PPAPI_NACL_DISALLOWED_SOCKETS(UDPSocketPrivateDisallowed) |
| 403 | 406 |
| 404 // HostResolver and HostResolverPrivate tests. | 407 // HostResolver and HostResolverPrivate tests. |
| 405 #define RUN_HOST_RESOLVER_SUBTESTS \ | 408 #define RUN_HOST_RESOLVER_SUBTESTS \ |
| 406 RunTestViaHTTP( \ | 409 RunTestViaHTTP( \ |
| (...skipping 1134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1541 | 1544 |
| 1542 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, | 1545 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, |
| 1543 MAYBE_PNACL_NONSFI(SuccessfulLoad)) { | 1546 MAYBE_PNACL_NONSFI(SuccessfulLoad)) { |
| 1544 RunTests(); | 1547 RunTests(); |
| 1545 } | 1548 } |
| 1546 | 1549 |
| 1547 IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest, | 1550 IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest, |
| 1548 MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) { | 1551 MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) { |
| 1549 RunTests(); | 1552 RunTests(); |
| 1550 } | 1553 } |
| OLD | NEW |