| 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 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1052 #else | 1052 #else |
| 1053 #define MAYBE_Fullscreen Fullscreen | 1053 #define MAYBE_Fullscreen Fullscreen |
| 1054 #endif | 1054 #endif |
| 1055 | 1055 |
| 1056 TEST_PPAPI_IN_PROCESS_VIA_HTTP(MAYBE_Fullscreen) | 1056 TEST_PPAPI_IN_PROCESS_VIA_HTTP(MAYBE_Fullscreen) |
| 1057 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(MAYBE_Fullscreen) | 1057 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(MAYBE_Fullscreen) |
| 1058 TEST_PPAPI_NACL(MAYBE_Fullscreen) | 1058 TEST_PPAPI_NACL(MAYBE_Fullscreen) |
| 1059 | 1059 |
| 1060 TEST_PPAPI_OUT_OF_PROCESS(X509CertificatePrivate) | 1060 TEST_PPAPI_OUT_OF_PROCESS(X509CertificatePrivate) |
| 1061 | 1061 |
| 1062 // There is no proxy. This is used for PDF metrics reporting, and PDF only | |
| 1063 // runs in process, so there's currently no need for a proxy. | |
| 1064 TEST_PPAPI_IN_PROCESS(UMA) | 1062 TEST_PPAPI_IN_PROCESS(UMA) |
| 1063 TEST_PPAPI_OUT_OF_PROCESS(UMA) |
| 1064 TEST_PPAPI_NACL(UMA) |
| 1065 | 1065 |
| 1066 // NetAddress tests | 1066 // NetAddress tests |
| 1067 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddress) { | 1067 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddress) { |
| 1068 RunTestViaHTTP( | 1068 RunTestViaHTTP( |
| 1069 LIST_TEST(NetAddress_IPv4Address) | 1069 LIST_TEST(NetAddress_IPv4Address) |
| 1070 LIST_TEST(NetAddress_IPv6Address) | 1070 LIST_TEST(NetAddress_IPv6Address) |
| 1071 LIST_TEST(NetAddress_DescribeAsString) | 1071 LIST_TEST(NetAddress_DescribeAsString) |
| 1072 ); | 1072 ); |
| 1073 } | 1073 } |
| 1074 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetAddress) { | 1074 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetAddress) { |
| (...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1627 LIST_TEST(FlashDRM_GetHmonitor) | 1627 LIST_TEST(FlashDRM_GetHmonitor) |
| 1628 LIST_TEST(FlashDRM_GetVoucherFile)); | 1628 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1629 } | 1629 } |
| 1630 | 1630 |
| 1631 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1631 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1632 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1632 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1633 | 1633 |
| 1634 #if defined(OS_CHROMEOS) | 1634 #if defined(OS_CHROMEOS) |
| 1635 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1635 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1636 #endif | 1636 #endif |
| OLD | NEW |