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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11437038: Revert 171408 (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/nacl/nacl_ipc_adapter.cc ('k') | content/browser/plugin_data_remover_impl.cc » ('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 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_ListObserver) 652 TEST_PPAPI_NACL_VIA_HTTP(NetworkMonitorPrivate_ListObserver)
653 653
654 TEST_PPAPI_IN_PROCESS(Flash_SetInstanceAlwaysOnTop) 654 TEST_PPAPI_IN_PROCESS(Flash_SetInstanceAlwaysOnTop)
655 TEST_PPAPI_IN_PROCESS(Flash_GetLocalTimeZoneOffset) 655 TEST_PPAPI_IN_PROCESS(Flash_GetLocalTimeZoneOffset)
656 TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs) 656 TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs)
657 TEST_PPAPI_IN_PROCESS(Flash_GetSetting) 657 TEST_PPAPI_IN_PROCESS(Flash_GetSetting)
658 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop) 658 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop)
659 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset) 659 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset)
660 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs) 660 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs)
661 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting) 661 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting)
662 // No in-process test for SetCrashData.
663 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData)
662 664
663 // NaCl based PPAPI tests with WebSocket server 665 // NaCl based PPAPI tests with WebSocket server
664 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket) 666 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket)
665 TEST_PPAPI_IN_PROCESS(WebSocket_UninitializedPropertiesAccess) 667 TEST_PPAPI_IN_PROCESS(WebSocket_UninitializedPropertiesAccess)
666 TEST_PPAPI_IN_PROCESS(WebSocket_InvalidConnect) 668 TEST_PPAPI_IN_PROCESS(WebSocket_InvalidConnect)
667 TEST_PPAPI_IN_PROCESS(WebSocket_Protocols) 669 TEST_PPAPI_IN_PROCESS(WebSocket_Protocols)
668 TEST_PPAPI_IN_PROCESS(WebSocket_GetURL) 670 TEST_PPAPI_IN_PROCESS(WebSocket_GetURL)
669 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidConnect) 671 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidConnect)
670 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_InvalidClose) 672 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_InvalidClose)
671 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidClose) 673 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidClose)
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 // marking it SLOW_ before disabling. 879 // marking it SLOW_ before disabling.
878 // - dmichael 880 // - dmichael
879 // MessageLoop_Post starts a thread so only run it if pepper threads are 881 // MessageLoop_Post starts a thread so only run it if pepper threads are
880 // enabled. 882 // enabled.
881 #ifdef ENABLE_PEPPER_THREADING 883 #ifdef ENABLE_PEPPER_THREADING
882 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post) 884 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post)
883 #endif 885 #endif
884 886
885 // Going forward, Flash APIs will only work out-of-process. 887 // Going forward, Flash APIs will only work out-of-process.
886 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL) 888 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL)
887 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData)
888 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard) 889 TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard)
889 TEST_PPAPI_OUT_OF_PROCESS(FlashFile) 890 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile)
890 // Mac/Aura reach NOTIMPLEMENTED/time out. 891 // Mac/Aura reach NOTIMPLEMENTED/time out.
891 // mac: http://crbug.com/96767 892 // mac: http://crbug.com/96767
892 // aura: http://crbug.com/104384 893 // aura: http://crbug.com/104384
893 #if defined(OS_MACOSX) || defined(USE_AURA) 894 #if defined(OS_MACOSX) || defined(USE_AURA)
894 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen 895 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen
895 #else 896 #else
896 #define MAYBE_FlashFullscreen FlashFullscreen 897 #define MAYBE_FlashFullscreen FlashFullscreen
897 #endif 898 #endif
898 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen) 899 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen)
899 900
900 TEST_PPAPI_IN_PROCESS(TalkPrivate) 901 TEST_PPAPI_IN_PROCESS(TalkPrivate)
901 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 902 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
902 903
903 #endif // ADDRESS_SANITIZER 904 #endif // ADDRESS_SANITIZER
OLDNEW
« no previous file with comments | « chrome/nacl/nacl_ipc_adapter.cc ('k') | content/browser/plugin_data_remover_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698