| 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 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1301 TEST_PPAPI_OUT_OF_PROCESS(DISABLED_FlashFullscreen) | 1301 TEST_PPAPI_OUT_OF_PROCESS(DISABLED_FlashFullscreen) |
| 1302 | 1302 |
| 1303 TEST_PPAPI_OUT_OF_PROCESS(PDF) | 1303 TEST_PPAPI_OUT_OF_PROCESS(PDF) |
| 1304 | 1304 |
| 1305 // TODO(dalecurtis): Renable once the platform verification infobar has been | 1305 // TODO(dalecurtis): Renable once the platform verification infobar has been |
| 1306 // implemented; see http://crbug.com/270908 | 1306 // implemented; see http://crbug.com/270908 |
| 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) |
| 1312 // http://crbug.com/419863 |
| 1313 #define MAYBE_FlashDRM DISABLED_FlashDRM |
| 1314 #else |
| 1315 #define MAYBE_FlashDRM FlashDRM |
| 1316 #endif |
| 1311 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FlashDRM) { | 1317 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FlashDRM) { |
| 1312 RunTest( | 1318 RunTest( |
| 1313 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) | 1319 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) |
| 1314 // Only implemented on Windows and ChromeOS currently. | 1320 // Only implemented on Windows and ChromeOS currently. |
| 1315 LIST_TEST(FlashDRM_GetDeviceID) | 1321 LIST_TEST(FlashDRM_GetDeviceID) |
| 1316 #endif | 1322 #endif |
| 1317 LIST_TEST(FlashDRM_GetHmonitor) | 1323 LIST_TEST(FlashDRM_GetHmonitor) |
| 1318 LIST_TEST(FlashDRM_GetVoucherFile)); | 1324 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1319 } | 1325 } |
| 1320 | 1326 |
| 1321 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1327 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1322 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1328 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1323 | 1329 |
| 1324 #if defined(OS_CHROMEOS) | 1330 #if defined(OS_CHROMEOS) |
| 1325 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1331 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1326 #endif | 1332 #endif |
| OLD | NEW |