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 1296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1307 // #if defined(OS_CHROMEOS) | 1307 // #if defined(OS_CHROMEOS) |
1308 // TEST_PPAPI_OUT_OF_PROCESS(PlatformVerificationPrivate) | 1308 // TEST_PPAPI_OUT_OF_PROCESS(PlatformVerificationPrivate) |
1309 // #endif | 1309 // #endif |
1310 | 1310 |
1311 #if defined(OS_MACOSX) | 1311 #if defined(OS_MACOSX) |
1312 // http://crbug.com/419863 | 1312 // http://crbug.com/419863 |
1313 #define MAYBE_FlashDRM DISABLED_FlashDRM | 1313 #define MAYBE_FlashDRM DISABLED_FlashDRM |
1314 #else | 1314 #else |
1315 #define MAYBE_FlashDRM FlashDRM | 1315 #define MAYBE_FlashDRM FlashDRM |
1316 #endif | 1316 #endif |
1317 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FlashDRM) { | 1317 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashDRM) { |
1318 RunTest( | 1318 RunTest( |
1319 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) | 1319 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) |
1320 // Only implemented on Windows and ChromeOS currently. | 1320 // Only implemented on Windows and ChromeOS currently. |
1321 LIST_TEST(FlashDRM_GetDeviceID) | 1321 LIST_TEST(FlashDRM_GetDeviceID) |
1322 #endif | 1322 #endif |
1323 LIST_TEST(FlashDRM_GetHmonitor) | 1323 LIST_TEST(FlashDRM_GetHmonitor) |
1324 LIST_TEST(FlashDRM_GetVoucherFile)); | 1324 LIST_TEST(FlashDRM_GetVoucherFile)); |
1325 } | 1325 } |
1326 | 1326 |
1327 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1327 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
1328 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1328 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
1329 | 1329 |
1330 #if defined(OS_CHROMEOS) | 1330 #if defined(OS_CHROMEOS) |
1331 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1331 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
1332 #endif | 1332 #endif |
OLD | NEW |