| 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 "content/common/content_switches.h" | 9 #include "content/common/content_switches.h" |
| 10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 | 220 |
| 221 TEST_PPAPI_IN_PROCESS(VarDeprecated) | 221 TEST_PPAPI_IN_PROCESS(VarDeprecated) |
| 222 // Disabled because it times out: http://crbug.com/89961 | 222 // Disabled because it times out: http://crbug.com/89961 |
| 223 //TEST_PPAPI_OUT_OF_PROCESS(VarDeprecated) | 223 //TEST_PPAPI_OUT_OF_PROCESS(VarDeprecated) |
| 224 | 224 |
| 225 // Windows defines 'PostMessage', so we have to undef it. | 225 // Windows defines 'PostMessage', so we have to undef it. |
| 226 #ifdef PostMessage | 226 #ifdef PostMessage |
| 227 #undef PostMessage | 227 #undef PostMessage |
| 228 #endif | 228 #endif |
| 229 TEST_PPAPI_IN_PROCESS(PostMessage) | 229 TEST_PPAPI_IN_PROCESS(PostMessage) |
| 230 #if !defined(OS_WIN) |
| 231 // Times out on Windows XP: http://crbug.com/95557 |
| 230 TEST_PPAPI_OUT_OF_PROCESS(PostMessage) | 232 TEST_PPAPI_OUT_OF_PROCESS(PostMessage) |
| 233 #endif |
| 231 | 234 |
| 232 TEST_PPAPI_IN_PROCESS(Memory) | 235 TEST_PPAPI_IN_PROCESS(Memory) |
| 233 TEST_PPAPI_OUT_OF_PROCESS(Memory) | 236 TEST_PPAPI_OUT_OF_PROCESS(Memory) |
| 234 | 237 |
| 235 TEST_PPAPI_IN_PROCESS(QueryPolicy) | 238 TEST_PPAPI_IN_PROCESS(QueryPolicy) |
| 236 //TEST_PPAPI_OUT_OF_PROCESS(QueryPolicy) | 239 //TEST_PPAPI_OUT_OF_PROCESS(QueryPolicy) |
| 237 | 240 |
| 238 TEST_PPAPI_IN_PROCESS(VideoDecoder) | 241 TEST_PPAPI_IN_PROCESS(VideoDecoder) |
| 239 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder) | 242 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder) |
| 240 | 243 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) { | 283 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) { |
| 281 RunTestViaHTTP("Transport"); | 284 RunTestViaHTTP("Transport"); |
| 282 } | 285 } |
| 283 #endif // ENABLE_P2P_APIS | 286 #endif // ENABLE_P2P_APIS |
| 284 | 287 |
| 285 TEST_PPAPI_IN_PROCESS(UMA) | 288 TEST_PPAPI_IN_PROCESS(UMA) |
| 286 // There is no proxy. | 289 // There is no proxy. |
| 287 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { | 290 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { |
| 288 RunTest("UMA"); | 291 RunTest("UMA"); |
| 289 } | 292 } |
| OLD | NEW |