| 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 1630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1641 #if defined(OS_LINUX) // Disabled due to flakiness http://crbug.com/316925 | 1641 #if defined(OS_LINUX) // Disabled due to flakiness http://crbug.com/316925 |
| 1642 #define MAYBE_FlashMessageLoop DISABLED_FlashMessageLoop | 1642 #define MAYBE_FlashMessageLoop DISABLED_FlashMessageLoop |
| 1643 #else | 1643 #else |
| 1644 #define MAYBE_FlashMessageLoop FlashMessageLoop | 1644 #define MAYBE_FlashMessageLoop FlashMessageLoop |
| 1645 #endif | 1645 #endif |
| 1646 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { | 1646 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { |
| 1647 RunTest(LIST_TEST(FlashMessageLoop_Basics) | 1647 RunTest(LIST_TEST(FlashMessageLoop_Basics) |
| 1648 LIST_TEST(FlashMessageLoop_RunWithoutQuit)); | 1648 LIST_TEST(FlashMessageLoop_RunWithoutQuit)); |
| 1649 } | 1649 } |
| 1650 | 1650 |
| 1651 TEST_PPAPI_OUT_OF_PROCESS(MediaStreamAudioTrack) |
| 1652 TEST_PPAPI_NACL(MediaStreamAudioTrack) |
| 1653 |
| 1651 TEST_PPAPI_OUT_OF_PROCESS(MediaStreamVideoTrack) | 1654 TEST_PPAPI_OUT_OF_PROCESS(MediaStreamVideoTrack) |
| 1652 TEST_PPAPI_NACL(MediaStreamVideoTrack) | 1655 TEST_PPAPI_NACL(MediaStreamVideoTrack) |
| 1653 | 1656 |
| 1654 TEST_PPAPI_IN_PROCESS(MouseCursor) | 1657 TEST_PPAPI_IN_PROCESS(MouseCursor) |
| 1655 TEST_PPAPI_OUT_OF_PROCESS(MouseCursor) | 1658 TEST_PPAPI_OUT_OF_PROCESS(MouseCursor) |
| 1656 TEST_PPAPI_NACL(MouseCursor) | 1659 TEST_PPAPI_NACL(MouseCursor) |
| 1657 | 1660 |
| 1658 // PPB_NetworkProxy is not supported in-process. | 1661 // PPB_NetworkProxy is not supported in-process. |
| 1659 TEST_PPAPI_OUT_OF_PROCESS(NetworkProxy) | 1662 TEST_PPAPI_OUT_OF_PROCESS(NetworkProxy) |
| 1660 TEST_PPAPI_NACL(NetworkProxy) | 1663 TEST_PPAPI_NACL(NetworkProxy) |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1717 LIST_TEST(FlashDRM_GetHmonitor) | 1720 LIST_TEST(FlashDRM_GetHmonitor) |
| 1718 LIST_TEST(FlashDRM_GetVoucherFile)); | 1721 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1719 } | 1722 } |
| 1720 | 1723 |
| 1721 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1724 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1722 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1725 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1723 | 1726 |
| 1724 #if defined(OS_CHROMEOS) | 1727 #if defined(OS_CHROMEOS) |
| 1725 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1728 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1726 #endif | 1729 #endif |
| OLD | NEW |