| 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 #define MAYBE_VarDeprecated DISABLED_VarDeprecated | 134 #define MAYBE_VarDeprecated DISABLED_VarDeprecated |
| 135 #else | 135 #else |
| 136 #define MAYBE_VarDeprecated VarDeprecated | 136 #define MAYBE_VarDeprecated VarDeprecated |
| 137 #endif | 137 #endif |
| 138 TEST_PPAPI_IN_PROCESS(VarDeprecated) | 138 TEST_PPAPI_IN_PROCESS(VarDeprecated) |
| 139 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_VarDeprecated) | 139 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_VarDeprecated) |
| 140 | 140 |
| 141 TEST_PPAPI_IN_PROCESS(VarResource) | 141 TEST_PPAPI_IN_PROCESS(VarResource) |
| 142 TEST_PPAPI_OUT_OF_PROCESS(VarResource) | 142 TEST_PPAPI_OUT_OF_PROCESS(VarResource) |
| 143 | 143 |
| 144 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder) |
| 145 |
| 144 TEST_PPAPI_IN_PROCESS(VideoDecoderDev) | 146 TEST_PPAPI_IN_PROCESS(VideoDecoderDev) |
| 145 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev) | 147 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev) |
| 146 | 148 |
| 147 } // namespace | 149 } // namespace |
| 148 } // namespace content | 150 } // namespace content |
| OLD | NEW |