| 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 1304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1315 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting) | 1315 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting) |
| 1316 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData) | 1316 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData) |
| 1317 // http://crbug.com/176822 | 1317 // http://crbug.com/176822 |
| 1318 #if !defined(OS_WIN) | 1318 #if !defined(OS_WIN) |
| 1319 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard) | 1319 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard) |
| 1320 #endif | 1320 #endif |
| 1321 TEST_PPAPI_OUT_OF_PROCESS(FlashFile) | 1321 TEST_PPAPI_OUT_OF_PROCESS(FlashFile) |
| 1322 // Mac/Aura reach NOTIMPLEMENTED/time out. | 1322 // Mac/Aura reach NOTIMPLEMENTED/time out. |
| 1323 // mac: http://crbug.com/96767 | 1323 // mac: http://crbug.com/96767 |
| 1324 // aura: http://crbug.com/104384 | 1324 // aura: http://crbug.com/104384 |
| 1325 #if defined(OS_MACOSX) | 1325 // cros: http://crbug.com/396502 |
| 1326 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) |
| 1326 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen | 1327 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen |
| 1327 #else | 1328 #else |
| 1328 #define MAYBE_FlashFullscreen FlashFullscreen | 1329 #define MAYBE_FlashFullscreen FlashFullscreen |
| 1329 #endif | 1330 #endif |
| 1330 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen) | 1331 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen) |
| 1331 | 1332 |
| 1332 TEST_PPAPI_OUT_OF_PROCESS(PDF) | 1333 TEST_PPAPI_OUT_OF_PROCESS(PDF) |
| 1333 | 1334 |
| 1334 // TODO(dalecurtis): Renable once the platform verification infobar has been | 1335 // TODO(dalecurtis): Renable once the platform verification infobar has been |
| 1335 // implemented; see http://crbug.com/270908 | 1336 // implemented; see http://crbug.com/270908 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 1346 LIST_TEST(FlashDRM_GetHmonitor) | 1347 LIST_TEST(FlashDRM_GetHmonitor) |
| 1347 LIST_TEST(FlashDRM_GetVoucherFile)); | 1348 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1348 } | 1349 } |
| 1349 | 1350 |
| 1350 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1351 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1351 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1352 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1352 | 1353 |
| 1353 #if defined(OS_CHROMEOS) | 1354 #if defined(OS_CHROMEOS) |
| 1354 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1355 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1355 #endif | 1356 #endif |
| OLD | NEW |