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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 | 245 |
246 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef) | 246 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef) |
247 // Disabled because it times out: http://crbug.com/89961 | 247 // Disabled because it times out: http://crbug.com/89961 |
248 //TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef) | 248 //TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef) |
249 | 249 |
250 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem) | 250 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem) |
251 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem) | 251 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem) |
252 | 252 |
253 // http://crbug.com/96767 | 253 // http://crbug.com/96767 |
254 #if !defined(OS_MACOSX) | 254 #if !defined(OS_MACOSX) |
255 TEST_F(PPAPITest, FLAKY_Fullscreen) { | 255 TEST_F(PPAPITest, FLAKY_FlashFullscreen) { |
| 256 RunTestViaHTTP("FlashFullscreen"); |
| 257 } |
| 258 TEST_F(OutOfProcessPPAPITest, FLAKY_FlashFullscreen) { |
| 259 RunTestViaHTTP("FlashFullscreen"); |
| 260 } |
| 261 // New implementation only honors fullscreen requests within a context of |
| 262 // a user gesture. Since we do not yet have an infrastructure for testing |
| 263 // those under ppapi_tests, the tests below time out when run automtically. |
| 264 // To test the code, run them manually following the directions here: |
| 265 // www.chromium.org/developers/design-documents/pepper-plugin-implementation |
| 266 // and click on the plugin area (gray square) to force fullscreen mode and |
| 267 // get the test unstuck. |
| 268 TEST_F(PPAPITest, DISABLED_Fullscreen) { |
256 RunTestViaHTTP("Fullscreen"); | 269 RunTestViaHTTP("Fullscreen"); |
257 } | 270 } |
258 TEST_F(OutOfProcessPPAPITest, FLAKY_Fullscreen) { | 271 TEST_F(OutOfProcessPPAPITest, DISABLED_Fullscreen) { |
259 RunTestViaHTTP("Fullscreen"); | 272 RunTestViaHTTP("Fullscreen"); |
260 } | 273 } |
261 #endif | 274 #endif |
262 | 275 |
263 #if defined(OS_POSIX) | 276 #if defined(OS_POSIX) |
264 #define MAYBE_DirectoryReader FLAKY_DirectoryReader | 277 #define MAYBE_DirectoryReader FLAKY_DirectoryReader |
265 #else | 278 #else |
266 #define MAYBE_DirectoryReader DirectoryReader | 279 #define MAYBE_DirectoryReader DirectoryReader |
267 #endif | 280 #endif |
268 | 281 |
(...skipping 15 matching lines...) Expand all Loading... |
284 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) { | 297 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) { |
285 RunTestViaHTTP("Transport"); | 298 RunTestViaHTTP("Transport"); |
286 } | 299 } |
287 #endif // ENABLE_P2P_APIS | 300 #endif // ENABLE_P2P_APIS |
288 | 301 |
289 TEST_PPAPI_IN_PROCESS(UMA) | 302 TEST_PPAPI_IN_PROCESS(UMA) |
290 // There is no proxy. | 303 // There is no proxy. |
291 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { | 304 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { |
292 RunTest("UMA"); | 305 RunTest("UMA"); |
293 } | 306 } |
OLD | NEW |