| 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 #include "content/test/ppapi/ppapi_test.h" | 6 #include "content/test/ppapi/ppapi_test.h" |
| 7 #include "ppapi/shared_impl/test_utils.h" | 7 #include "ppapi/shared_impl/test_utils.h" |
| 8 | 8 |
| 9 // This file lists tests for Pepper APIs (without NaCl) against content_shell. | 9 // This file lists tests for Pepper APIs (without NaCl) against content_shell. |
| 10 // TODO(teravest): Move more tests here. http://crbug.com/371873 | 10 // TODO(teravest): Move more tests here. http://crbug.com/371873 |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 #else | 145 #else |
| 146 #define MAYBE_VarDeprecated VarDeprecated | 146 #define MAYBE_VarDeprecated VarDeprecated |
| 147 #endif | 147 #endif |
| 148 TEST_PPAPI_IN_PROCESS(VarDeprecated) | 148 TEST_PPAPI_IN_PROCESS(VarDeprecated) |
| 149 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_VarDeprecated) | 149 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_VarDeprecated) |
| 150 | 150 |
| 151 TEST_PPAPI_IN_PROCESS(VarResource) | 151 TEST_PPAPI_IN_PROCESS(VarResource) |
| 152 TEST_PPAPI_OUT_OF_PROCESS(VarResource) | 152 TEST_PPAPI_OUT_OF_PROCESS(VarResource) |
| 153 | 153 |
| 154 // Flaky on Win, Linux and CrOS, http://crbug.com/602877 | 154 // Flaky on Win, Linux and CrOS, http://crbug.com/602877 |
| 155 #if defined(OS_MACOSX) | 155 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) |
| 156 #define MAYBE_VideoDecoder DISABLED_VideoDecoder | 156 #define MAYBE_VideoDecoder DISABLED_VideoDecoder |
| 157 #else | 157 #else |
| 158 #define MAYBE_VideoDecoder VideoDecoder | 158 #define MAYBE_VideoDecoder VideoDecoder |
| 159 #endif | 159 #endif |
| 160 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_VideoDecoder) | 160 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_VideoDecoder) |
| 161 | 161 |
| 162 TEST_PPAPI_IN_PROCESS(VideoDecoderDev) | 162 TEST_PPAPI_IN_PROCESS(VideoDecoderDev) |
| 163 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev) | 163 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev) |
| 164 | 164 |
| 165 TEST_PPAPI_OUT_OF_PROCESS(VideoEncoder) | 165 TEST_PPAPI_OUT_OF_PROCESS(VideoEncoder) |
| 166 | 166 |
| 167 } // namespace | 167 } // namespace |
| 168 } // namespace content | 168 } // namespace content |
| OLD | NEW |