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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11415140: Refactor 3 PPB_Flash functions 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 | « no previous file | content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h » ('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 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_Basic) 653 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_Basic)
654 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_2Monitors) 654 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_2Monitors)
655 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_DeleteInCallback) 655 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_DeleteInCallback)
656 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_ListObserver) 656 TEST_PPAPI_OUT_OF_PROCESS(NetworkMonitorPrivate_ListObserver)
657 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_Basic) 657 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_Basic)
658 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_2Monitors) 658 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_2Monitors)
659 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_DeleteInCallback) 659 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_DeleteInCallback)
660 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_ListObserver) 660 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_ListObserver)
661 661
662 TEST_PPAPI_IN_PROCESS(Flash_SetInstanceAlwaysOnTop) 662 TEST_PPAPI_IN_PROCESS(Flash_SetInstanceAlwaysOnTop)
663 TEST_PPAPI_IN_PROCESS(Flash_GetProxyForURL)
664 TEST_PPAPI_IN_PROCESS(Flash_GetLocalTimeZoneOffset) 663 TEST_PPAPI_IN_PROCESS(Flash_GetLocalTimeZoneOffset)
665 TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs) 664 TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs)
666 TEST_PPAPI_IN_PROCESS(Flash_GetSetting) 665 TEST_PPAPI_IN_PROCESS(Flash_GetSetting)
667 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop) 666 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop)
668 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL)
669 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset) 667 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset)
670 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs) 668 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs)
671 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting) 669 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting)
672 // No in-process test for SetCrashData. 670 // No in-process test for SetCrashData.
673 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData) 671 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData)
674 672
675 // NaCl based PPAPI tests with WebSocket server 673 // NaCl based PPAPI tests with WebSocket server
676 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket) 674 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket)
677 TEST_PPAPI_IN_PROCESS(WebSocket_UninitializedPropertiesAccess) 675 TEST_PPAPI_IN_PROCESS(WebSocket_UninitializedPropertiesAccess)
678 TEST_PPAPI_IN_PROCESS(WebSocket_InvalidConnect) 676 TEST_PPAPI_IN_PROCESS(WebSocket_InvalidConnect)
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 // slowness, particularly on Windows XP. If this test times out, please try 886 // slowness, particularly on Windows XP. If this test times out, please try
889 // marking it SLOW_ before disabling. 887 // marking it SLOW_ before disabling.
890 // - dmichael 888 // - dmichael
891 // MessageLoop_Post starts a thread so only run it if pepper threads are 889 // MessageLoop_Post starts a thread so only run it if pepper threads are
892 // enabled. 890 // enabled.
893 #ifdef ENABLE_PEPPER_THREADING 891 #ifdef ENABLE_PEPPER_THREADING
894 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post) 892 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post)
895 #endif 893 #endif
896 894
897 // Going forward, Flash APIs will only work out-of-process. 895 // Going forward, Flash APIs will only work out-of-process.
896 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL)
898 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard) 897 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard)
899 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile) 898 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile)
900 // Mac/Aura reach NOTIMPLEMENTED/time out. 899 // Mac/Aura reach NOTIMPLEMENTED/time out.
901 // mac: http://crbug.com/96767 900 // mac: http://crbug.com/96767
902 // aura: http://crbug.com/104384 901 // aura: http://crbug.com/104384
903 #if defined(OS_MACOSX) || defined(USE_AURA) 902 #if defined(OS_MACOSX) || defined(USE_AURA)
904 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen 903 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen
905 #else 904 #else
906 #define MAYBE_FlashFullscreen FlashFullscreen 905 #define MAYBE_FlashFullscreen FlashFullscreen
907 #endif 906 #endif
908 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen) 907 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen)
909 908
910 TEST_PPAPI_IN_PROCESS(TalkPrivate) 909 TEST_PPAPI_IN_PROCESS(TalkPrivate)
911 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 910 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
912 911
913 #endif // ADDRESS_SANITIZER 912 #endif // ADDRESS_SANITIZER
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698