| 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 999 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1010 | 1010 |
| 1011 // Repeatedly flaky on Win7 Tests(1): http://crbug.com/389084 | 1011 // Repeatedly flaky on Win7 Tests(1): http://crbug.com/389084 |
| 1012 #if defined(OS_WIN) | 1012 #if defined(OS_WIN) |
| 1013 #define MAYBE_WebSocket2 DISABLED_WebSocket2 | 1013 #define MAYBE_WebSocket2 DISABLED_WebSocket2 |
| 1014 #else | 1014 #else |
| 1015 #define MAYBE_WebSocket2 WebSocket2 | 1015 #define MAYBE_WebSocket2 WebSocket2 |
| 1016 #endif | 1016 #endif |
| 1017 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_WebSocket2) { | 1017 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_WebSocket2) { |
| 1018 RUN_WEBSOCKET_SUBTESTS_2; | 1018 RUN_WEBSOCKET_SUBTESTS_2; |
| 1019 } | 1019 } |
| 1020 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket1) { | 1020 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket1) { |
| 1021 RUN_WEBSOCKET_SUBTESTS_1; | 1021 RUN_WEBSOCKET_SUBTESTS_1; |
| 1022 } | 1022 } |
| 1023 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket2) { | 1023 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket2) { |
| 1024 RUN_WEBSOCKET_SUBTESTS_2; | 1024 RUN_WEBSOCKET_SUBTESTS_2; |
| 1025 } | 1025 } |
| 1026 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) { | 1026 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) { |
| 1027 RUN_WEBSOCKET_SUBTESTS_1; | 1027 RUN_WEBSOCKET_SUBTESTS_1; |
| 1028 } | 1028 } |
| 1029 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { | 1029 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { |
| 1030 RUN_WEBSOCKET_SUBTESTS_2; | 1030 RUN_WEBSOCKET_SUBTESTS_2; |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1350 LIST_TEST(FlashDRM_GetHmonitor) | 1350 LIST_TEST(FlashDRM_GetHmonitor) |
| 1351 LIST_TEST(FlashDRM_GetVoucherFile)); | 1351 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1352 } | 1352 } |
| 1353 | 1353 |
| 1354 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1354 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1355 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1355 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1356 | 1356 |
| 1357 #if defined(OS_CHROMEOS) | 1357 #if defined(OS_CHROMEOS) |
| 1358 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1358 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1359 #endif | 1359 #endif |
| OLD | NEW |