| Index: chrome/test/ui/ppapi_uitest.cc
|
| diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
|
| index 42236f5a4a192d8b1334d928ddef6d5edc7ede0e..fc650c8cc3476b3bf9521a411dce1a2fce8e9c81 100644
|
| --- a/chrome/test/ui/ppapi_uitest.cc
|
| +++ b/chrome/test/ui/ppapi_uitest.cc
|
| @@ -737,6 +737,16 @@ TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_TextSendReceive)
|
| TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BinarySendReceive)
|
| TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BufferedAmount)
|
| TEST_PPAPI_IN_PROCESS_WITH_WS(MAYBE_WebSocket_CcInterfaces)
|
| +TEST_PPAPI_IN_PROCESS(WebSocket_UtilityInvalidConnect)
|
| +TEST_PPAPI_IN_PROCESS(WebSocket_UtilityProtocols)
|
| +TEST_PPAPI_IN_PROCESS(WebSocket_UtilityGetURL)
|
| +TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_UtilityValidConnect)
|
| +TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_UtilityInvalidClose)
|
| +TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_UtilityValidClose)
|
| +TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_UtilityGetProtocol)
|
| +TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_UtilityTextSendReceive)
|
| +TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_UtilityBinarySendReceive)
|
| +TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_UtilityBufferedAmount)
|
| TEST_PPAPI_NACL_VIA_HTTP(WebSocket_IsWebSocket)
|
| TEST_PPAPI_NACL_VIA_HTTP(WebSocket_UninitializedPropertiesAccess)
|
| TEST_PPAPI_NACL_VIA_HTTP(WebSocket_InvalidConnect)
|
| @@ -750,6 +760,16 @@ TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_TextSendReceive)
|
| TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_BinarySendReceive)
|
| TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_BufferedAmount)
|
| TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(MAYBE_WebSocket_CcInterfaces)
|
| +TEST_PPAPI_NACL_VIA_HTTP(WebSocket_UtilityInvalidConnect)
|
| +TEST_PPAPI_NACL_VIA_HTTP(WebSocket_UtilityProtocols)
|
| +TEST_PPAPI_NACL_VIA_HTTP(WebSocket_UtilityGetURL)
|
| +TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_UtilityValidConnect)
|
| +TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_UtilityInvalidClose)
|
| +TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_UtilityValidClose)
|
| +TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_UtilityGetProtocol)
|
| +TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_UtilityTextSendReceive)
|
| +TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_UtilityBinarySendReceive)
|
| +TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_UtilityBufferedAmount)
|
|
|
| #if defined(OS_WIN)
|
| TEST_NACL_VIA_HTTP_WITH_HARDWARE_EXCEPTION_HANDLING(Exception)
|
|
|