| 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 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1064 LIST_TEST(NetAddressPrivateUntrusted_GetAddress) | 1064 LIST_TEST(NetAddressPrivateUntrusted_GetAddress) |
| 1065 ); | 1065 ); |
| 1066 } | 1066 } |
| 1067 | 1067 |
| 1068 // NetworkMonitor tests. | 1068 // NetworkMonitor tests. |
| 1069 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetworkMonitor) { | 1069 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetworkMonitor) { |
| 1070 RunTestViaHTTP( | 1070 RunTestViaHTTP( |
| 1071 LIST_TEST(NetworkMonitorPrivate_Basic) | 1071 LIST_TEST(NetworkMonitorPrivate_Basic) |
| 1072 LIST_TEST(NetworkMonitorPrivate_2Monitors) | 1072 LIST_TEST(NetworkMonitorPrivate_2Monitors) |
| 1073 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback) | 1073 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback) |
| 1074 LIST_TEST(NetworkMonitorPrivate_ListObserver) | |
| 1075 ); | 1074 ); |
| 1076 } | 1075 } |
| 1077 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetworkMonitor) { | 1076 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetworkMonitor) { |
| 1078 RunTestViaHTTP( | 1077 RunTestViaHTTP( |
| 1079 LIST_TEST(NetworkMonitorPrivate_Basic) | 1078 LIST_TEST(NetworkMonitorPrivate_Basic) |
| 1080 LIST_TEST(NetworkMonitorPrivate_2Monitors) | 1079 LIST_TEST(NetworkMonitorPrivate_2Monitors) |
| 1081 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback) | 1080 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback) |
| 1082 LIST_TEST(NetworkMonitorPrivate_ListObserver) | |
| 1083 ); | 1081 ); |
| 1084 } | 1082 } |
| 1085 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(NetworkMonitor)) { | 1083 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(NetworkMonitor)) { |
| 1086 RunTestViaHTTP( | 1084 RunTestViaHTTP( |
| 1087 LIST_TEST(NetworkMonitorPrivate_Basic) | 1085 LIST_TEST(NetworkMonitorPrivate_Basic) |
| 1088 LIST_TEST(NetworkMonitorPrivate_2Monitors) | 1086 LIST_TEST(NetworkMonitorPrivate_2Monitors) |
| 1089 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback) | 1087 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback) |
| 1090 LIST_TEST(NetworkMonitorPrivate_ListObserver) | |
| 1091 ); | 1088 ); |
| 1092 } | 1089 } |
| 1093 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetworkMonitor) { | 1090 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetworkMonitor) { |
| 1094 RunTestViaHTTP( | 1091 RunTestViaHTTP( |
| 1095 LIST_TEST(NetworkMonitorPrivate_Basic) | 1092 LIST_TEST(NetworkMonitorPrivate_Basic) |
| 1096 LIST_TEST(NetworkMonitorPrivate_2Monitors) | 1093 LIST_TEST(NetworkMonitorPrivate_2Monitors) |
| 1097 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback) | 1094 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback) |
| 1098 LIST_TEST(NetworkMonitorPrivate_ListObserver) | |
| 1099 ); | 1095 ); |
| 1100 } | 1096 } |
| 1101 | 1097 |
| 1102 // Flash tests. | 1098 // Flash tests. |
| 1103 IN_PROC_BROWSER_TEST_F(PPAPITest, Flash) { | 1099 IN_PROC_BROWSER_TEST_F(PPAPITest, Flash) { |
| 1104 RunTestViaHTTP( | 1100 RunTestViaHTTP( |
| 1105 LIST_TEST(Flash_SetInstanceAlwaysOnTop) | 1101 LIST_TEST(Flash_SetInstanceAlwaysOnTop) |
| 1106 LIST_TEST(Flash_GetCommandLineArgs) | 1102 LIST_TEST(Flash_GetCommandLineArgs) |
| 1107 ); | 1103 ); |
| 1108 } | 1104 } |
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1526 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) | 1522 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) |
| 1527 // Only implemented on Windows and ChromeOS currently. | 1523 // Only implemented on Windows and ChromeOS currently. |
| 1528 LIST_TEST(FlashDRM_GetDeviceID) | 1524 LIST_TEST(FlashDRM_GetDeviceID) |
| 1529 #endif | 1525 #endif |
| 1530 LIST_TEST(FlashDRM_GetHmonitor) | 1526 LIST_TEST(FlashDRM_GetHmonitor) |
| 1531 LIST_TEST(FlashDRM_GetVoucherFile)); | 1527 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1532 } | 1528 } |
| 1533 | 1529 |
| 1534 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1530 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1535 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1531 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| OLD | NEW |