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

Side by Side Diff: chrome/test/ppapi/ppapi_browsertest.cc

Issue 11421066: Refactor PPB_Flash_Fullscreen to the new resource model. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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 | « chrome/renderer/pepper/pepper_flash_fullscreen_host.cc ('k') | ppapi/ppapi_proxy.gypi » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/test/ppapi/ppapi_test.h" 5 #include "chrome/test/ppapi/ppapi_test.h"
6 6
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/browser/content_settings/host_content_settings_map.h" 9 #include "chrome/browser/content_settings/host_content_settings_map.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 // PPAPINaClTest.FileSystem times out consistently on Windows and Mac. 574 // PPAPINaClTest.FileSystem times out consistently on Windows and Mac.
575 // http://crbug.com/130372 575 // http://crbug.com/130372
576 #if defined(OS_MACOSX) || defined(OS_WIN) 576 #if defined(OS_MACOSX) || defined(OS_WIN)
577 #define MAYBE_FileSystem DISABLED_FileSystem 577 #define MAYBE_FileSystem DISABLED_FileSystem
578 #else 578 #else
579 #define MAYBE_FileSystem FileSystem 579 #define MAYBE_FileSystem FileSystem
580 #endif 580 #endif
581 581
582 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_FileSystem) 582 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_FileSystem)
583 583
584 // Mac/Aura reach NOTIMPLEMENTED/time out.
585 // Other systems work in-process, but flake out-of-process because of the
586 // asyncronous nature of the proxy.
587 // mac: http://crbug.com/96767
588 // aura: http://crbug.com/104384
589 // async flakiness: http://crbug.com/108471
590 #if defined(OS_MACOSX) || defined(USE_AURA)
591 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen
592 #define MAYBE_OutOfProcessFlashFullscreen DISABLED_FlashFullscreen
593 #else
594 #define MAYBE_FlashFullscreen FlashFullscreen
595 #define MAYBE_OutOfProcessFlashFullscreen FlashFullscreen
596 #endif
597
598 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_FlashFullscreen) {
599 RunTestViaHTTP("FlashFullscreen");
600 }
601 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_OutOfProcessFlashFullscreen) {
602 RunTestViaHTTP("FlashFullscreen");
603 }
604
605 #if defined(OS_MACOSX) 584 #if defined(OS_MACOSX)
606 // http://crbug.com/103912 585 // http://crbug.com/103912
607 #define MAYBE_Fullscreen DISABLED_Fullscreen 586 #define MAYBE_Fullscreen DISABLED_Fullscreen
608 #elif defined(OS_LINUX) 587 #elif defined(OS_LINUX)
609 // http://crbug.com/146008 588 // http://crbug.com/146008
610 #define MAYBE_Fullscreen DISABLED_Fullscreen 589 #define MAYBE_Fullscreen DISABLED_Fullscreen
611 #else 590 #else
612 #define MAYBE_Fullscreen Fullscreen 591 #define MAYBE_Fullscreen Fullscreen
613 #endif 592 #endif
614 593
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 // - dmichael 889 // - dmichael
911 // MessageLoop_Post starts a thread so only run it if pepper threads are 890 // MessageLoop_Post starts a thread so only run it if pepper threads are
912 // enabled. 891 // enabled.
913 #ifdef ENABLE_PEPPER_THREADING 892 #ifdef ENABLE_PEPPER_THREADING
914 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post) 893 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post)
915 #endif 894 #endif
916 895
917 // Going forward, Flash APIs will only work out-of-process. 896 // Going forward, Flash APIs will only work out-of-process.
918 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard) 897 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard)
919 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile) 898 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile)
899 // Mac/Aura reach NOTIMPLEMENTED/time out.
900 // mac: http://crbug.com/96767
901 // aura: http://crbug.com/104384
902 #if defined(OS_MACOSX) || defined(USE_AURA)
903 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen
904 #else
905 #define MAYBE_FlashFullscreen FlashFullscreen
906 #endif
907 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen)
920 908
921 TEST_PPAPI_IN_PROCESS(TalkPrivate) 909 TEST_PPAPI_IN_PROCESS(TalkPrivate)
922 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 910 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
923 911
924 #endif // ADDRESS_SANITIZER 912 #endif // ADDRESS_SANITIZER
OLDNEW
« no previous file with comments | « chrome/renderer/pepper/pepper_flash_fullscreen_host.cc ('k') | ppapi/ppapi_proxy.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698