Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Side by Side Diff: chrome/test/ui/ppapi_uitest.cc

Issue 8874001: Revert "aura: Reenable PPAPITest.FLAKY_FlashFullscreen." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/browser/plugin_service.h" 9 #include "content/browser/plugin_service.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef) 506 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef)
507 // Disabled because it times out: http://crbug.com/89961 507 // Disabled because it times out: http://crbug.com/89961
508 // TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef) 508 // TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef)
509 TEST_PPAPI_NACL_VIA_HTTP(FileRef) 509 TEST_PPAPI_NACL_VIA_HTTP(FileRef)
510 510
511 511
512 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem) 512 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem)
513 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem) 513 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem)
514 TEST_PPAPI_NACL_VIA_HTTP(FileSystem) 514 TEST_PPAPI_NACL_VIA_HTTP(FileSystem)
515 515
516 // http://crbug.com/96767 516 // http://crbug.com/96767 and 104384 for aura.
517 #if !defined(OS_MACOSX) 517 #if !defined(OS_MACOSX) && !defined(USE_AURA)
518 #define MAYBE_FlashFullscreen FLAKY_FlashFullscreen
518 #define MAYBE_FlashFullscreen FLAKY_FlashFullscreen 519 #define MAYBE_FlashFullscreen FLAKY_FlashFullscreen
519 #else 520 #else
520 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen 521 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen
522 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen
521 #endif 523 #endif
522 524
523 TEST_F(PPAPITest, MAYBE_FlashFullscreen) { 525 TEST_F(PPAPITest, MAYBE_FlashFullscreen) {
524 RunTestViaHTTP("FlashFullscreen"); 526 RunTestViaHTTP("FlashFullscreen");
525 } 527 }
526 TEST_F(OutOfProcessPPAPITest, MAYBE_FlashFullscreen) { 528 TEST_F(OutOfProcessPPAPITest, MAYBE_FlashFullscreen) {
527 RunTestViaHTTP("FlashFullscreen"); 529 RunTestViaHTTP("FlashFullscreen");
528 } 530 }
529 // New implementation only honors fullscreen requests within a context of 531 // New implementation only honors fullscreen requests within a context of
530 // a user gesture. Since we do not yet have an infrastructure for testing 532 // a user gesture. Since we do not yet have an infrastructure for testing
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_InvalidConfigs) 617 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_InvalidConfigs)
616 618
617 TEST_PPAPI_IN_PROCESS(Audio_Creation) 619 TEST_PPAPI_IN_PROCESS(Audio_Creation)
618 TEST_PPAPI_IN_PROCESS(Audio_DestroyNoStop) 620 TEST_PPAPI_IN_PROCESS(Audio_DestroyNoStop)
619 TEST_PPAPI_IN_PROCESS(Audio_Failures) 621 TEST_PPAPI_IN_PROCESS(Audio_Failures)
620 TEST_PPAPI_OUT_OF_PROCESS(Audio_Creation) 622 TEST_PPAPI_OUT_OF_PROCESS(Audio_Creation)
621 TEST_PPAPI_OUT_OF_PROCESS(Audio_DestroyNoStop) 623 TEST_PPAPI_OUT_OF_PROCESS(Audio_DestroyNoStop)
622 TEST_PPAPI_OUT_OF_PROCESS(Audio_Failures) 624 TEST_PPAPI_OUT_OF_PROCESS(Audio_Failures)
623 625
624 #endif // ADDRESS_SANITIZER 626 #endif // ADDRESS_SANITIZER
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698