OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/file_util.h" | 5 #include "base/file_util.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
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/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
10 #include "chrome/test/automation/tab_proxy.h" | 10 #include "chrome/test/automation/tab_proxy.h" |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 #endif | 208 #endif |
209 TEST_PPAPI_IN_PROCESS(PostMessage) | 209 TEST_PPAPI_IN_PROCESS(PostMessage) |
210 TEST_PPAPI_OUT_OF_PROCESS(PostMessage) | 210 TEST_PPAPI_OUT_OF_PROCESS(PostMessage) |
211 | 211 |
212 TEST_PPAPI_IN_PROCESS(Memory) | 212 TEST_PPAPI_IN_PROCESS(Memory) |
213 TEST_PPAPI_OUT_OF_PROCESS(Memory) | 213 TEST_PPAPI_OUT_OF_PROCESS(Memory) |
214 | 214 |
215 TEST_PPAPI_IN_PROCESS(QueryPolicy) | 215 TEST_PPAPI_IN_PROCESS(QueryPolicy) |
216 //TEST_PPAPI_OUT_OF_PROCESS(QueryPolicy) | 216 //TEST_PPAPI_OUT_OF_PROCESS(QueryPolicy) |
217 | 217 |
| 218 TEST_PPAPI_IN_PROCESS(VideoDecoder) |
| 219 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder) |
| 220 |
218 // http://crbug.com/90039 and http://crbug.com/83443 (Mac) | 221 // http://crbug.com/90039 and http://crbug.com/83443 (Mac) |
219 TEST_F(PPAPITest, FAILS_FileIO) { | 222 TEST_F(PPAPITest, FAILS_FileIO) { |
220 RunTestViaHTTP("FileIO"); | 223 RunTestViaHTTP("FileIO"); |
221 } | 224 } |
222 TEST_F(OutOfProcessPPAPITest, FAILS_FileIO) { | 225 TEST_F(OutOfProcessPPAPITest, FAILS_FileIO) { |
223 RunTestViaHTTP("FileIO"); | 226 RunTestViaHTTP("FileIO"); |
224 } | 227 } |
225 | 228 |
226 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef) | 229 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef) |
227 // Disabled because it times out: http://crbug.com/89961 | 230 // Disabled because it times out: http://crbug.com/89961 |
(...skipping 29 matching lines...) Expand all Loading... |
257 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) { | 260 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) { |
258 RunTestViaHTTP("Transport"); | 261 RunTestViaHTTP("Transport"); |
259 } | 262 } |
260 #endif // ENABLE_P2P_APIS | 263 #endif // ENABLE_P2P_APIS |
261 | 264 |
262 TEST_PPAPI_IN_PROCESS(UMA) | 265 TEST_PPAPI_IN_PROCESS(UMA) |
263 // There is no proxy. | 266 // There is no proxy. |
264 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { | 267 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { |
265 RunTest("UMA"); | 268 RunTest("UMA"); |
266 } | 269 } |
267 | |
268 TEST_PPAPI_IN_PROCESS(VideoDecoder) | |
269 // There is no proxy yet (vrk is adding it). | |
270 TEST_F(OutOfProcessPPAPITest, FAILS_VideoDecoder) { | |
271 RunTest("VideoDecoder"); | |
272 } | |
OLD | NEW |