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 998 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1009 #define MAYBE_WebSocket2 DISABLED_WebSocket2 | 1009 #define MAYBE_WebSocket2 DISABLED_WebSocket2 |
1010 #else | 1010 #else |
1011 #define MAYBE_WebSocket2 WebSocket2 | 1011 #define MAYBE_WebSocket2 WebSocket2 |
1012 #endif | 1012 #endif |
1013 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_WebSocket2) { | 1013 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_WebSocket2) { |
1014 RUN_WEBSOCKET_SUBTESTS_2; | 1014 RUN_WEBSOCKET_SUBTESTS_2; |
1015 } | 1015 } |
1016 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket1) { | 1016 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket1) { |
1017 RUN_WEBSOCKET_SUBTESTS_1; | 1017 RUN_WEBSOCKET_SUBTESTS_1; |
1018 } | 1018 } |
1019 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket2) { | 1019 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket2) { |
1020 RUN_WEBSOCKET_SUBTESTS_2; | 1020 RUN_WEBSOCKET_SUBTESTS_2; |
1021 } | 1021 } |
1022 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) { | 1022 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) { |
1023 RUN_WEBSOCKET_SUBTESTS_1; | 1023 RUN_WEBSOCKET_SUBTESTS_1; |
1024 } | 1024 } |
1025 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { | 1025 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { |
1026 RUN_WEBSOCKET_SUBTESTS_2; | 1026 RUN_WEBSOCKET_SUBTESTS_2; |
1027 } | 1027 } |
1028 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket1)) { | 1028 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket1)) { |
1029 RUN_WEBSOCKET_SUBTESTS_1; | 1029 RUN_WEBSOCKET_SUBTESTS_1; |
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1346 LIST_TEST(FlashDRM_GetHmonitor) | 1346 LIST_TEST(FlashDRM_GetHmonitor) |
1347 LIST_TEST(FlashDRM_GetVoucherFile)); | 1347 LIST_TEST(FlashDRM_GetVoucherFile)); |
1348 } | 1348 } |
1349 | 1349 |
1350 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1350 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
1351 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1351 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
1352 | 1352 |
1353 #if defined(OS_CHROMEOS) | 1353 #if defined(OS_CHROMEOS) |
1354 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1354 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
1355 #endif | 1355 #endif |
OLD | NEW |