| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/test/ppapi/ppapi_test.h" | 5 #include "content/test/ppapi/ppapi_test.h" |
| 6 #include "ppapi/shared_impl/test_harness_utils.h" | 6 #include "ppapi/shared_impl/test_harness_utils.h" |
| 7 | 7 |
| 8 // This file lists tests for Pepper APIs (without NaCl) against content_shell. | 8 // This file lists tests for Pepper APIs (without NaCl) against content_shell. |
| 9 // TODO(teravest): Move more tests here. http://crbug.com/371873 | 9 // TODO(teravest): Move more tests here. http://crbug.com/371873 |
| 10 | 10 |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 IN_PROC_BROWSER_TEST_F(PPAPITest, Instance_RecursiveObjects) { | 94 IN_PROC_BROWSER_TEST_F(PPAPITest, Instance_RecursiveObjects) { |
| 95 RunTestAndReload("Instance_RecursiveObjects"); | 95 RunTestAndReload("Instance_RecursiveObjects"); |
| 96 } | 96 } |
| 97 // TODO(dmichael): Make it work out-of-process (or at least see whether we | 97 // TODO(dmichael): Make it work out-of-process (or at least see whether we |
| 98 // care). | 98 // care). |
| 99 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, | 99 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, |
| 100 DISABLED_Instance_RecursiveObjects) { | 100 DISABLED_Instance_RecursiveObjects) { |
| 101 RunTestAndReload("Instance_RecursiveObjects"); | 101 RunTestAndReload("Instance_RecursiveObjects"); |
| 102 } | 102 } |
| 103 | 103 |
| 104 #if defined(OS_WIN) | 104 TEST_PPAPI_OUT_OF_PROCESS(MediaStreamAudioTrack) |
| 105 // Flaky on Windows (crbug.com/438729) | |
| 106 #define MAYBE_MediaStreamAudioTrack DISABLED_MediaStreamAudioTrack; | |
| 107 #else | |
| 108 #define MAYBE_MediaStreamAudioTrack MediaStreamAudioTrack; | |
| 109 #endif | |
| 110 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_MediaStreamAudioTrack) | |
| 111 | 105 |
| 112 TEST_PPAPI_OUT_OF_PROCESS(MediaStreamVideoTrack) | 106 TEST_PPAPI_OUT_OF_PROCESS(MediaStreamVideoTrack) |
| 113 | 107 |
| 114 TEST_PPAPI_IN_PROCESS(Memory) | 108 TEST_PPAPI_IN_PROCESS(Memory) |
| 115 TEST_PPAPI_OUT_OF_PROCESS(Memory) | 109 TEST_PPAPI_OUT_OF_PROCESS(Memory) |
| 116 | 110 |
| 117 TEST_PPAPI_OUT_OF_PROCESS(MessageHandler) | 111 TEST_PPAPI_OUT_OF_PROCESS(MessageHandler) |
| 118 | 112 |
| 119 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Basics) | 113 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Basics) |
| 120 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post) | 114 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post) |
| (...skipping 28 matching lines...) Expand all Loading... |
| 149 TEST_PPAPI_IN_PROCESS(VarResource) | 143 TEST_PPAPI_IN_PROCESS(VarResource) |
| 150 TEST_PPAPI_OUT_OF_PROCESS(VarResource) | 144 TEST_PPAPI_OUT_OF_PROCESS(VarResource) |
| 151 | 145 |
| 152 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder) | 146 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder) |
| 153 | 147 |
| 154 TEST_PPAPI_IN_PROCESS(VideoDecoderDev) | 148 TEST_PPAPI_IN_PROCESS(VideoDecoderDev) |
| 155 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev) | 149 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev) |
| 156 | 150 |
| 157 } // namespace | 151 } // namespace |
| 158 } // namespace content | 152 } // namespace content |
| OLD | NEW |