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 1534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1545 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) | 1545 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) |
1546 // Only implemented on Windows and ChromeOS currently. | 1546 // Only implemented on Windows and ChromeOS currently. |
1547 LIST_TEST(FlashDRM_GetDeviceID) | 1547 LIST_TEST(FlashDRM_GetDeviceID) |
1548 #endif | 1548 #endif |
1549 LIST_TEST(FlashDRM_GetHmonitor) | 1549 LIST_TEST(FlashDRM_GetHmonitor) |
1550 LIST_TEST(FlashDRM_GetVoucherFile)); | 1550 LIST_TEST(FlashDRM_GetVoucherFile)); |
1551 } | 1551 } |
1552 | 1552 |
1553 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1553 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
1554 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1554 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1555 |
| 1556 #if defined(OS_CHROMEOS) |
| 1557 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1558 #endif |
OLD | NEW |