| Index: chrome/test/ppapi/ppapi_browsertest.cc
|
| diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
|
| index 6736d88bd8d13d3df053f156a24b3c9f0f81110c..d3b728b34293c98702d73c34ff1e157243294a52 100644
|
| --- a/chrome/test/ppapi/ppapi_browsertest.cc
|
| +++ b/chrome/test/ppapi/ppapi_browsertest.cc
|
| @@ -287,9 +287,27 @@ TEST_PPAPI_NACL_WITH_SSL_SERVER(MAYBE_TCPSocketPrivate)
|
| TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted)
|
| TEST_PPAPI_IN_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted)
|
|
|
| -TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate)
|
| -TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate)
|
| -TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate)
|
| +// UDPSocketPrivate tests.
|
| +// UDPSocketPrivate_Broadcast is disabled for OSX because it requires
|
| +// root permissions on OSX 10.7+.
|
| +TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate_Connect)
|
| +TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate_ConnectFailure)
|
| +#if !defined(OS_MACOSX)
|
| +TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate_Broadcast)
|
| +#endif // !defined(OS_MACOSX)
|
| +TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate_SetSocketFeatureErrors)
|
| +TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_Connect)
|
| +TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_ConnectFailure)
|
| +#if !defined(OS_MACOSX)
|
| +TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_Broadcast)
|
| +#endif // !defined(OS_MACOSX)
|
| +TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_SetSocketFeatureErrors)
|
| +TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate_Connect)
|
| +TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate_ConnectFailure)
|
| +#if !defined(OS_MACOSX)
|
| +TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate_Broadcast)
|
| +#endif // !defined(OS_MACOSX)
|
| +TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate_SetSocketFeatureErrors)
|
|
|
| TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(TCPServerSocketPrivateDisallowed)
|
| TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(TCPSocketPrivateDisallowed)
|
|
|