| 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/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
| 10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 RunTestViaHTTP("FileIO"); | 244 RunTestViaHTTP("FileIO"); |
| 245 } | 245 } |
| 246 | 246 |
| 247 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef) | 247 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef) |
| 248 // Disabled because it times out: http://crbug.com/89961 | 248 // Disabled because it times out: http://crbug.com/89961 |
| 249 //TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef) | 249 //TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef) |
| 250 | 250 |
| 251 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem) | 251 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem) |
| 252 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem) | 252 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem) |
| 253 | 253 |
| 254 // http://crbug.com/96767 | 254 // http://crbug.com/96767 and 104384 for aura. |
| 255 #if !defined(OS_MACOSX) | 255 #if !defined(OS_MACOSX) && !defined(USE_AURA) |
| 256 TEST_F(PPAPITest, FLAKY_FlashFullscreen) { | 256 #define MAYBE_FlashFullscreen FLAKY_FlashFullscreen |
| 257 #define MAYBE_FlashFullscreen FLAKY_FlashFullscreen |
| 258 #else |
| 259 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen |
| 260 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen |
| 261 #endif |
| 262 |
| 263 TEST_F(PPAPITest, MAYBE_FlashFullscreen) { |
| 257 RunTestViaHTTP("FlashFullscreen"); | 264 RunTestViaHTTP("FlashFullscreen"); |
| 258 } | 265 } |
| 259 TEST_F(OutOfProcessPPAPITest, FLAKY_FlashFullscreen) { | 266 TEST_F(OutOfProcessPPAPITest, MAYBE_FlashFullscreen) { |
| 260 RunTestViaHTTP("FlashFullscreen"); | 267 RunTestViaHTTP("FlashFullscreen"); |
| 261 } | 268 } |
| 262 // New implementation only honors fullscreen requests within a context of | 269 // New implementation only honors fullscreen requests within a context of |
| 263 // a user gesture. Since we do not yet have an infrastructure for testing | 270 // a user gesture. Since we do not yet have an infrastructure for testing |
| 264 // those under ppapi_tests, the tests below time out when run automtically. | 271 // those under ppapi_tests, the tests below time out when run automtically. |
| 265 // To test the code, run them manually following the directions here: | 272 // To test the code, run them manually following the directions here: |
| 266 // www.chromium.org/developers/design-documents/pepper-plugin-implementation | 273 // www.chromium.org/developers/design-documents/pepper-plugin-implementation |
| 267 // and click on the plugin area (gray square) to force fullscreen mode and | 274 // and click on the plugin area (gray square) to force fullscreen mode and |
| 268 // get the test unstuck. | 275 // get the test unstuck. |
| 269 TEST_F(PPAPITest, DISABLED_Fullscreen) { | 276 TEST_F(PPAPITest, DISABLED_Fullscreen) { |
| 270 RunTestViaHTTP("Fullscreen"); | 277 RunTestViaHTTP("Fullscreen"); |
| 271 } | 278 } |
| 272 TEST_F(OutOfProcessPPAPITest, DISABLED_Fullscreen) { | 279 TEST_F(OutOfProcessPPAPITest, DISABLED_Fullscreen) { |
| 273 RunTestViaHTTP("Fullscreen"); | 280 RunTestViaHTTP("Fullscreen"); |
| 274 } | 281 } |
| 275 #endif | |
| 276 | 282 |
| 277 TEST_PPAPI_IN_PROCESS(FlashClipboard) | 283 TEST_PPAPI_IN_PROCESS(FlashClipboard) |
| 278 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard) | 284 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard) |
| 279 | 285 |
| 280 #if defined(OS_POSIX) | 286 #if defined(OS_POSIX) |
| 281 #define MAYBE_DirectoryReader FLAKY_DirectoryReader | 287 #define MAYBE_DirectoryReader FLAKY_DirectoryReader |
| 282 #else | 288 #else |
| 283 #define MAYBE_DirectoryReader DirectoryReader | 289 #define MAYBE_DirectoryReader DirectoryReader |
| 284 #endif | 290 #endif |
| 285 | 291 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 309 RunTest("UMA"); | 315 RunTest("UMA"); |
| 310 } | 316 } |
| 311 | 317 |
| 312 TEST_PPAPI_IN_PROCESS(NetAddressPrivate) | 318 TEST_PPAPI_IN_PROCESS(NetAddressPrivate) |
| 313 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate) | 319 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate) |
| 314 | 320 |
| 315 // PPB_TCPSocket_Private currently isn't supported in-process. | 321 // PPB_TCPSocket_Private currently isn't supported in-process. |
| 316 TEST_F(OutOfProcessPPAPITest, TCPSocketPrivate) { | 322 TEST_F(OutOfProcessPPAPITest, TCPSocketPrivate) { |
| 317 RunTestViaHTTP("TCPSocketPrivate"); | 323 RunTestViaHTTP("TCPSocketPrivate"); |
| 318 } | 324 } |
| OLD | NEW |