| 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 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1059 LIST_TEST(NetAddressPrivateUntrusted_Describe) | 1059 LIST_TEST(NetAddressPrivateUntrusted_Describe) |
| 1060 LIST_TEST(NetAddressPrivateUntrusted_ReplacePort) | 1060 LIST_TEST(NetAddressPrivateUntrusted_ReplacePort) |
| 1061 LIST_TEST(NetAddressPrivateUntrusted_GetAnyAddress) | 1061 LIST_TEST(NetAddressPrivateUntrusted_GetAnyAddress) |
| 1062 LIST_TEST(NetAddressPrivateUntrusted_GetFamily) | 1062 LIST_TEST(NetAddressPrivateUntrusted_GetFamily) |
| 1063 LIST_TEST(NetAddressPrivateUntrusted_GetPort) | 1063 LIST_TEST(NetAddressPrivateUntrusted_GetPort) |
| 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(PPAPITest, NetworkMonitor) { | |
| 1070 RunTestViaHTTP( | |
| 1071 LIST_TEST(NetworkMonitorPrivate_Basic) | |
| 1072 LIST_TEST(NetworkMonitorPrivate_2Monitors) | |
| 1073 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback) | |
| 1074 LIST_TEST(NetworkMonitorPrivate_ListObserver) | |
| 1075 ); | |
| 1076 } | |
| 1077 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetworkMonitor) { | 1069 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetworkMonitor) { |
| 1078 RunTestViaHTTP( | 1070 RunTestViaHTTP( |
| 1079 LIST_TEST(NetworkMonitorPrivate_Basic) | 1071 LIST_TEST(NetworkMonitorPrivate_Basic) |
| 1080 LIST_TEST(NetworkMonitorPrivate_2Monitors) | 1072 LIST_TEST(NetworkMonitorPrivate_2Monitors) |
| 1081 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback) | 1073 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback) |
| 1082 LIST_TEST(NetworkMonitorPrivate_ListObserver) | 1074 LIST_TEST(NetworkMonitorPrivate_ListObserver) |
| 1083 ); | 1075 ); |
| 1084 } | 1076 } |
| 1085 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetworkMonitor) { | 1077 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetworkMonitor) { |
| 1086 RunTestViaHTTP( | 1078 RunTestViaHTTP( |
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1534 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) | 1526 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) |
| 1535 // Only implemented on Windows and ChromeOS currently. | 1527 // Only implemented on Windows and ChromeOS currently. |
| 1536 LIST_TEST(FlashDRM_GetDeviceID) | 1528 LIST_TEST(FlashDRM_GetDeviceID) |
| 1537 #endif | 1529 #endif |
| 1538 LIST_TEST(FlashDRM_GetHmonitor) | 1530 LIST_TEST(FlashDRM_GetHmonitor) |
| 1539 LIST_TEST(FlashDRM_GetVoucherFile)); | 1531 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1540 } | 1532 } |
| 1541 | 1533 |
| 1542 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1534 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1543 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1535 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| OLD | NEW |