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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 // and click on the plugin area (gray square) to force fullscreen mode and | 266 // and click on the plugin area (gray square) to force fullscreen mode and |
267 // get the test unstuck. | 267 // get the test unstuck. |
268 TEST_F(PPAPITest, DISABLED_Fullscreen) { | 268 TEST_F(PPAPITest, DISABLED_Fullscreen) { |
269 RunTestViaHTTP("Fullscreen"); | 269 RunTestViaHTTP("Fullscreen"); |
270 } | 270 } |
271 TEST_F(OutOfProcessPPAPITest, DISABLED_Fullscreen) { | 271 TEST_F(OutOfProcessPPAPITest, DISABLED_Fullscreen) { |
272 RunTestViaHTTP("Fullscreen"); | 272 RunTestViaHTTP("Fullscreen"); |
273 } | 273 } |
274 #endif | 274 #endif |
275 | 275 |
| 276 TEST_PPAPI_IN_PROCESS(FlashClipboard) |
| 277 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard) |
| 278 |
276 #if defined(OS_POSIX) | 279 #if defined(OS_POSIX) |
277 #define MAYBE_DirectoryReader FLAKY_DirectoryReader | 280 #define MAYBE_DirectoryReader FLAKY_DirectoryReader |
278 #else | 281 #else |
279 #define MAYBE_DirectoryReader DirectoryReader | 282 #define MAYBE_DirectoryReader DirectoryReader |
280 #endif | 283 #endif |
281 | 284 |
282 // Flaky on Mac + Linux, maybe http://codereview.chromium.org/7094008 | 285 // Flaky on Mac + Linux, maybe http://codereview.chromium.org/7094008 |
283 TEST_F(PPAPITest, MAYBE_DirectoryReader) { | 286 TEST_F(PPAPITest, MAYBE_DirectoryReader) { |
284 RunTestViaHTTP("DirectoryReader"); | 287 RunTestViaHTTP("DirectoryReader"); |
285 } | 288 } |
(...skipping 11 matching lines...) Expand all Loading... |
297 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) { | 300 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) { |
298 RunTestViaHTTP("Transport"); | 301 RunTestViaHTTP("Transport"); |
299 } | 302 } |
300 #endif // ENABLE_P2P_APIS | 303 #endif // ENABLE_P2P_APIS |
301 | 304 |
302 TEST_PPAPI_IN_PROCESS(UMA) | 305 TEST_PPAPI_IN_PROCESS(UMA) |
303 // There is no proxy. | 306 // There is no proxy. |
304 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { | 307 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { |
305 RunTest("UMA"); | 308 RunTest("UMA"); |
306 } | 309 } |
OLD | NEW |