| 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 | 208 |
| 209 TEST_PPAPI_IN_PROCESS(VarDeprecated) | 209 TEST_PPAPI_IN_PROCESS(VarDeprecated) |
| 210 // Disabled because it times out: http://crbug.com/89961 | 210 // Disabled because it times out: http://crbug.com/89961 |
| 211 //TEST_PPAPI_OUT_OF_PROCESS(VarDeprecated) | 211 //TEST_PPAPI_OUT_OF_PROCESS(VarDeprecated) |
| 212 | 212 |
| 213 // Windows defines 'PostMessage', so we have to undef it. | 213 // Windows defines 'PostMessage', so we have to undef it. |
| 214 #ifdef PostMessage | 214 #ifdef PostMessage |
| 215 #undef PostMessage | 215 #undef PostMessage |
| 216 #endif | 216 #endif |
| 217 TEST_PPAPI_IN_PROCESS(PostMessage) | 217 TEST_PPAPI_IN_PROCESS(PostMessage) |
| 218 | 218 TEST_PPAPI_OUT_OF_PROCESS(PostMessage) |
| 219 // Times out: http://crbug.com/93260 | |
| 220 TEST_F(OutOfProcessPPAPITest, FAILS_PostMessage) { | |
| 221 RunTest("PostMessage"); | |
| 222 } | |
| 223 | 219 |
| 224 TEST_PPAPI_IN_PROCESS(Memory) | 220 TEST_PPAPI_IN_PROCESS(Memory) |
| 225 TEST_PPAPI_OUT_OF_PROCESS(Memory) | 221 TEST_PPAPI_OUT_OF_PROCESS(Memory) |
| 226 | 222 |
| 227 TEST_PPAPI_IN_PROCESS(QueryPolicy) | 223 TEST_PPAPI_IN_PROCESS(QueryPolicy) |
| 228 //TEST_PPAPI_OUT_OF_PROCESS(QueryPolicy) | 224 //TEST_PPAPI_OUT_OF_PROCESS(QueryPolicy) |
| 229 | 225 |
| 230 TEST_PPAPI_IN_PROCESS(VideoDecoder) | 226 TEST_PPAPI_IN_PROCESS(VideoDecoder) |
| 231 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder) | 227 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder) |
| 232 | 228 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) { | 268 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) { |
| 273 RunTestViaHTTP("Transport"); | 269 RunTestViaHTTP("Transport"); |
| 274 } | 270 } |
| 275 #endif // ENABLE_P2P_APIS | 271 #endif // ENABLE_P2P_APIS |
| 276 | 272 |
| 277 TEST_PPAPI_IN_PROCESS(UMA) | 273 TEST_PPAPI_IN_PROCESS(UMA) |
| 278 // There is no proxy. | 274 // There is no proxy. |
| 279 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { | 275 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { |
| 280 RunTest("UMA"); | 276 RunTest("UMA"); |
| 281 } | 277 } |
| OLD | NEW |