| 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 946 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 957 LIST_TEST(WebSocket_CcInterfaces) \ | 957 LIST_TEST(WebSocket_CcInterfaces) \ |
| 958 LIST_TEST(WebSocket_UtilityInvalidConnect) \ | 958 LIST_TEST(WebSocket_UtilityInvalidConnect) \ |
| 959 LIST_TEST(WebSocket_UtilityProtocols) \ | 959 LIST_TEST(WebSocket_UtilityProtocols) \ |
| 960 LIST_TEST(WebSocket_UtilityGetURL) \ | 960 LIST_TEST(WebSocket_UtilityGetURL) \ |
| 961 LIST_TEST(WebSocket_UtilityValidConnect) \ | 961 LIST_TEST(WebSocket_UtilityValidConnect) \ |
| 962 LIST_TEST(WebSocket_UtilityInvalidClose) \ | 962 LIST_TEST(WebSocket_UtilityInvalidClose) \ |
| 963 LIST_TEST(WebSocket_UtilityValidClose) \ | 963 LIST_TEST(WebSocket_UtilityValidClose) \ |
| 964 LIST_TEST(WebSocket_UtilityGetProtocol) \ | 964 LIST_TEST(WebSocket_UtilityGetProtocol) \ |
| 965 LIST_TEST(WebSocket_UtilityTextSendReceive) \ | 965 LIST_TEST(WebSocket_UtilityTextSendReceive) \ |
| 966 LIST_TEST(WebSocket_UtilityBinarySendReceive) \ | 966 LIST_TEST(WebSocket_UtilityBinarySendReceive) \ |
| 967 LIST_TEST(WebSocket_UtilityBufferedAmount) \ | |
| 968 ) | 967 ) |
| 969 | 968 // TODO(yhirano): List this test in SUBTESTS_2 once the close ordering |
| 969 // is implemented correctly. |
| 970 // LIST_TEST(WebSocket_UtilityBufferedAmount) |
| 970 | 971 |
| 971 IN_PROC_BROWSER_TEST_F(PPAPITest, WebSocket1) { | 972 IN_PROC_BROWSER_TEST_F(PPAPITest, WebSocket1) { |
| 972 RUN_WEBSOCKET_SUBTESTS_1; | 973 RUN_WEBSOCKET_SUBTESTS_1; |
| 973 } | 974 } |
| 974 IN_PROC_BROWSER_TEST_F(PPAPITest, WebSocket2) { | 975 IN_PROC_BROWSER_TEST_F(PPAPITest, WebSocket2) { |
| 975 RUN_WEBSOCKET_SUBTESTS_2; | 976 RUN_WEBSOCKET_SUBTESTS_2; |
| 976 } | 977 } |
| 977 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket1) { | 978 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket1) { |
| 978 RUN_WEBSOCKET_SUBTESTS_1; | 979 RUN_WEBSOCKET_SUBTESTS_1; |
| 979 } | 980 } |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1259 LIST_TEST(FlashDRM_GetHmonitor) | 1260 LIST_TEST(FlashDRM_GetHmonitor) |
| 1260 LIST_TEST(FlashDRM_GetVoucherFile)); | 1261 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1261 } | 1262 } |
| 1262 | 1263 |
| 1263 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1264 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1264 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1265 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1265 | 1266 |
| 1266 #if defined(OS_CHROMEOS) | 1267 #if defined(OS_CHROMEOS) |
| 1267 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1268 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1268 #endif | 1269 #endif |
| OLD | NEW |