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 945 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
956 // http://crbug.com/146008 | 956 // http://crbug.com/146008 |
957 #define MAYBE_Fullscreen DISABLED_Fullscreen | 957 #define MAYBE_Fullscreen DISABLED_Fullscreen |
958 #else | 958 #else |
959 #define MAYBE_Fullscreen Fullscreen | 959 #define MAYBE_Fullscreen Fullscreen |
960 #endif | 960 #endif |
961 | 961 |
962 TEST_PPAPI_IN_PROCESS_VIA_HTTP(MAYBE_Fullscreen) | 962 TEST_PPAPI_IN_PROCESS_VIA_HTTP(MAYBE_Fullscreen) |
963 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(MAYBE_Fullscreen) | 963 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(MAYBE_Fullscreen) |
964 TEST_PPAPI_NACL(MAYBE_Fullscreen) | 964 TEST_PPAPI_NACL(MAYBE_Fullscreen) |
965 | 965 |
966 TEST_PPAPI_IN_PROCESS(X509CertificatePrivate) | |
967 TEST_PPAPI_OUT_OF_PROCESS(X509CertificatePrivate) | 966 TEST_PPAPI_OUT_OF_PROCESS(X509CertificatePrivate) |
968 | 967 |
969 // There is no proxy. This is used for PDF metrics reporting, and PDF only | 968 // There is no proxy. This is used for PDF metrics reporting, and PDF only |
970 // runs in process, so there's currently no need for a proxy. | 969 // runs in process, so there's currently no need for a proxy. |
971 TEST_PPAPI_IN_PROCESS(UMA) | 970 TEST_PPAPI_IN_PROCESS(UMA) |
972 | 971 |
973 // NetAddress tests | 972 // NetAddress tests |
974 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddress) { | 973 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddress) { |
975 RunTestViaHTTP( | 974 RunTestViaHTTP( |
976 LIST_TEST(NetAddress_IPv4Address) | 975 LIST_TEST(NetAddress_IPv4Address) |
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1526 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) | 1525 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) |
1527 // Only implemented on Windows and ChromeOS currently. | 1526 // Only implemented on Windows and ChromeOS currently. |
1528 LIST_TEST(FlashDRM_GetDeviceID) | 1527 LIST_TEST(FlashDRM_GetDeviceID) |
1529 #endif | 1528 #endif |
1530 LIST_TEST(FlashDRM_GetHmonitor) | 1529 LIST_TEST(FlashDRM_GetHmonitor) |
1531 LIST_TEST(FlashDRM_GetVoucherFile)); | 1530 LIST_TEST(FlashDRM_GetVoucherFile)); |
1532 } | 1531 } |
1533 | 1532 |
1534 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1533 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
1535 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1534 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
OLD | NEW |