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 1511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1522 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) | 1522 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) |
1523 // Only implemented on Windows and ChromeOS currently. | 1523 // Only implemented on Windows and ChromeOS currently. |
1524 LIST_TEST(FlashDRM_GetDeviceID) | 1524 LIST_TEST(FlashDRM_GetDeviceID) |
1525 #endif | 1525 #endif |
1526 LIST_TEST(FlashDRM_GetHmonitor) | 1526 LIST_TEST(FlashDRM_GetHmonitor) |
1527 LIST_TEST(FlashDRM_GetVoucherFile)); | 1527 LIST_TEST(FlashDRM_GetVoucherFile)); |
1528 } | 1528 } |
1529 | 1529 |
1530 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1530 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
1531 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1531 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
1532 | |
1533 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | |
kcwu
2013/09/16 11:57:37
I'm not sure what kind of tests (in process, out o
dmichael (off chromium)
2013/09/17 17:25:33
What you have seems right to me. If it's not being
kcwu
2013/09/17 23:15:31
Thanks.
| |
OLD | NEW |