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

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

Issue 12288013: Add PNaCl PPAPI browser tests via pre-translation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 months 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 | « build/common.gypi ('k') | chrome/test/ppapi/ppapi_test.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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #define TEST_PPAPI_NACL(test_name) 61 #define TEST_PPAPI_NACL(test_name)
62 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) 62 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name)
63 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) 63 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name)
64 64
65 #elif defined(ARCH_CPU_ARM_FAMILY) 65 #elif defined(ARCH_CPU_ARM_FAMILY)
66 // NaCl glibc tests are not included in ARM as there is no glibc support 66 // NaCl glibc tests are not included in ARM as there is no glibc support
67 // on ARM today. 67 // on ARM today.
68 #define TEST_PPAPI_NACL(test_name) \ 68 #define TEST_PPAPI_NACL(test_name) \
69 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ 69 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
70 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ 70 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
71 } \
72 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \
73 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
71 } 74 }
72 75
73 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) \ 76 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) \
74 IN_PROC_BROWSER_TEST_F(PPAPINaClTestDisallowedSockets, test_name) { \ 77 IN_PROC_BROWSER_TEST_F(PPAPINaClTestDisallowedSockets, test_name) { \
75 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ 78 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
76 } 79 }
77 80
78 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) \ 81 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) \
79 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ 82 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
80 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ 83 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
84 } \
85 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \
86 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
81 } 87 }
82 88
83 #else 89 #else
84 90
85 // NaCl based PPAPI tests 91 // NaCl based PPAPI tests
86 #define TEST_PPAPI_NACL(test_name) \ 92 #define TEST_PPAPI_NACL(test_name) \
87 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ 93 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
88 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ 94 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
89 } \ 95 } \
90 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, test_name) { \ 96 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, test_name) { \
91 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ 97 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
98 } \
99 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \
100 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
92 } 101 }
93 102
94 // NaCl based PPAPI tests with disallowed socket API 103 // NaCl based PPAPI tests with disallowed socket API
95 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) \ 104 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) \
96 IN_PROC_BROWSER_TEST_F(PPAPINaClTestDisallowedSockets, test_name) { \ 105 IN_PROC_BROWSER_TEST_F(PPAPINaClTestDisallowedSockets, test_name) { \
97 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ 106 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
98 } 107 }
99 108
100 // NaCl based PPAPI tests with SSL server 109 // NaCl based PPAPI tests with SSL server
101 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) \ 110 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) \
102 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ 111 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
103 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ 112 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
104 } \ 113 } \
105 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, test_name) { \ 114 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, test_name) { \
106 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ 115 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
116 } \
117 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \
118 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
107 } 119 }
108 120
109 #endif 121 #endif
110 122
111 123
112 // NaCl glibc tests are not included in ARM as there is no glibc support 124 // NaCl glibc tests are not included in ARM as there is no glibc support
113 // on ARM today. 125 // on ARM today.
114 #if defined(ARCH_CPU_ARM_FAMILY) 126 #if defined(ARCH_CPU_ARM_FAMILY)
115 #define MAYBE_GLIBC(test_name) DISABLED_##test_name 127 #define MAYBE_GLIBC(test_name) DISABLED_##test_name
116 #else 128 #else
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 LIST_TEST(DISABLED_URLLoader_TrustedJavascriptURLRestriction) 448 LIST_TEST(DISABLED_URLLoader_TrustedJavascriptURLRestriction)
437 LIST_TEST(URLLoader_UntrustedHttpRequests) 449 LIST_TEST(URLLoader_UntrustedHttpRequests)
438 LIST_TEST(DISABLED_URLLoader_TrustedHttpRequests) 450 LIST_TEST(DISABLED_URLLoader_TrustedHttpRequests)
439 LIST_TEST(URLLoader_FollowURLRedirect) 451 LIST_TEST(URLLoader_FollowURLRedirect)
440 LIST_TEST(URLLoader_AuditURLRedirect) 452 LIST_TEST(URLLoader_AuditURLRedirect)
441 LIST_TEST(URLLoader_AbortCalls) 453 LIST_TEST(URLLoader_AbortCalls)
442 LIST_TEST(URLLoader_UntendedLoad) 454 LIST_TEST(URLLoader_UntendedLoad)
443 LIST_TEST(URLLoader_PrefetchBufferThreshold) 455 LIST_TEST(URLLoader_PrefetchBufferThreshold)
444 ); 456 );
445 } 457 }
458 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader) {
459 RunTestViaHTTP(
460 LIST_TEST(URLLoader_BasicGET)
461 LIST_TEST(URLLoader_BasicPOST)
462 LIST_TEST(URLLoader_BasicFilePOST)
463 LIST_TEST(URLLoader_BasicFileRangePOST)
464 LIST_TEST(URLLoader_CompoundBodyPOST)
465 LIST_TEST(URLLoader_EmptyDataPOST)
466 LIST_TEST(URLLoader_BinaryDataPOST)
467 LIST_TEST(URLLoader_CustomRequestHeader)
468 LIST_TEST(URLLoader_FailsBogusContentLength)
469 LIST_TEST(URLLoader_StreamToFile)
470 LIST_TEST(URLLoader_UntrustedSameOriginRestriction)
471 // We don't support Trusted APIs in NaCl.
472 LIST_TEST(DISABLED_URLLoader_TrustedSameOriginRestriction)
473 LIST_TEST(URLLoader_UntrustedCrossOriginRequest)
474 LIST_TEST(DISABLED_URLLoader_TrustedCrossOriginRequest)
475 LIST_TEST(URLLoader_UntrustedJavascriptURLRestriction)
476 // TODO(bbudge) Fix Javascript URLs for trusted loaders.
477 // http://crbug.com/103062
478 LIST_TEST(DISABLED_URLLoader_TrustedJavascriptURLRestriction)
479 LIST_TEST(URLLoader_UntrustedHttpRequests)
480 LIST_TEST(DISABLED_URLLoader_TrustedHttpRequests)
481 LIST_TEST(URLLoader_FollowURLRedirect)
482 LIST_TEST(URLLoader_AuditURLRedirect)
483 LIST_TEST(URLLoader_AbortCalls)
484 LIST_TEST(URLLoader_UntendedLoad)
485 LIST_TEST(URLLoader_PrefetchBufferThreshold)
486 );
487 }
446 488
447 // URLRequestInfo tests. 489 // URLRequestInfo tests.
448 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_CreateAndIsURLRequestInfo) 490 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_CreateAndIsURLRequestInfo)
449 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_CreateAndIsURLRequestInfo) 491 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_CreateAndIsURLRequestInfo)
450 492
451 // Timing out on Windows. http://crbug.com/129571 493 // Timing out on Windows. http://crbug.com/129571
452 #if defined(OS_WIN) 494 #if defined(OS_WIN)
453 #define MAYBE_URLRequest_CreateAndIsURLRequestInfo \ 495 #define MAYBE_URLRequest_CreateAndIsURLRequestInfo \
454 DISABLED_URLRequest_CreateAndIsURLRequestInfo 496 DISABLED_URLRequest_CreateAndIsURLRequestInfo
455 #else 497 #else
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 IN_PROC_BROWSER_TEST_F(PPAPITest, PostMessage) { 555 IN_PROC_BROWSER_TEST_F(PPAPITest, PostMessage) {
514 RunTestViaHTTP( 556 RunTestViaHTTP(
515 LIST_TEST(PostMessage_SendInInit) 557 LIST_TEST(PostMessage_SendInInit)
516 LIST_TEST(PostMessage_SendingData) 558 LIST_TEST(PostMessage_SendingData)
517 LIST_TEST(PostMessage_SendingArrayBuffer) 559 LIST_TEST(PostMessage_SendingArrayBuffer)
518 LIST_TEST(PostMessage_MessageEvent) 560 LIST_TEST(PostMessage_MessageEvent)
519 LIST_TEST(PostMessage_NoHandler) 561 LIST_TEST(PostMessage_NoHandler)
520 LIST_TEST(PostMessage_ExtraParam) 562 LIST_TEST(PostMessage_ExtraParam)
521 ); 563 );
522 } 564 }
523
524 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, PostMessage) { 565 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, PostMessage) {
525 RunTestViaHTTP( 566 RunTestViaHTTP(
526 LIST_TEST(PostMessage_SendInInit) 567 LIST_TEST(PostMessage_SendInInit)
527 LIST_TEST(PostMessage_SendingData) 568 LIST_TEST(PostMessage_SendingData)
528 LIST_TEST(PostMessage_SendingArrayBuffer) 569 LIST_TEST(PostMessage_SendingArrayBuffer)
529 LIST_TEST(PostMessage_MessageEvent) 570 LIST_TEST(PostMessage_MessageEvent)
530 LIST_TEST(PostMessage_NoHandler) 571 LIST_TEST(PostMessage_NoHandler)
531 LIST_TEST(PostMessage_ExtraParam) 572 LIST_TEST(PostMessage_ExtraParam)
532 LIST_TEST(PostMessage_NonMainThread) 573 LIST_TEST(PostMessage_NonMainThread)
533 ); 574 );
534 } 575 }
535
536 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, PostMessage) { 576 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, PostMessage) {
537 RunTestViaHTTP( 577 RunTestViaHTTP(
538 LIST_TEST(PostMessage_SendInInit) 578 LIST_TEST(PostMessage_SendInInit)
539 LIST_TEST(PostMessage_SendingData) 579 LIST_TEST(PostMessage_SendingData)
540 LIST_TEST(PostMessage_SendingArrayBuffer) 580 LIST_TEST(PostMessage_SendingArrayBuffer)
541 LIST_TEST(PostMessage_MessageEvent) 581 LIST_TEST(PostMessage_MessageEvent)
542 LIST_TEST(PostMessage_NoHandler) 582 LIST_TEST(PostMessage_NoHandler)
543 LIST_TEST(PostMessage_ExtraParam) 583 LIST_TEST(PostMessage_ExtraParam)
544 LIST_TEST(PostMessage_NonMainThread) 584 LIST_TEST(PostMessage_NonMainThread)
545 ); 585 );
546 } 586 }
547
548 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(PostMessage)) { 587 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(PostMessage)) {
549 RunTestViaHTTP( 588 RunTestViaHTTP(
550 LIST_TEST(PostMessage_SendInInit) 589 LIST_TEST(PostMessage_SendInInit)
551 LIST_TEST(PostMessage_SendingData) 590 LIST_TEST(PostMessage_SendingData)
552 LIST_TEST(PostMessage_SendingArrayBuffer) 591 LIST_TEST(PostMessage_SendingArrayBuffer)
553 LIST_TEST(PostMessage_MessageEvent) 592 LIST_TEST(PostMessage_MessageEvent)
554 LIST_TEST(PostMessage_NoHandler) 593 LIST_TEST(PostMessage_NoHandler)
555 LIST_TEST(PostMessage_ExtraParam) 594 LIST_TEST(PostMessage_ExtraParam)
556 LIST_TEST(PostMessage_NonMainThread) 595 LIST_TEST(PostMessage_NonMainThread)
557 ); 596 );
558 } 597 }
598 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, PostMessage) {
599 RunTestViaHTTP(
600 LIST_TEST(PostMessage_SendInInit)
601 LIST_TEST(PostMessage_SendingData)
602 LIST_TEST(PostMessage_SendingArrayBuffer)
603 LIST_TEST(PostMessage_MessageEvent)
604 LIST_TEST(PostMessage_NoHandler)
605 LIST_TEST(PostMessage_ExtraParam)
606 LIST_TEST(PostMessage_NonMainThread)
607 );
608 }
559 609
560 TEST_PPAPI_IN_PROCESS(Memory) 610 TEST_PPAPI_IN_PROCESS(Memory)
561 TEST_PPAPI_OUT_OF_PROCESS(Memory) 611 TEST_PPAPI_OUT_OF_PROCESS(Memory)
562 TEST_PPAPI_NACL(Memory) 612 TEST_PPAPI_NACL(Memory)
563 613
564 TEST_PPAPI_IN_PROCESS(VideoDecoder) 614 TEST_PPAPI_IN_PROCESS(VideoDecoder)
565 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder) 615 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder)
566 616
567 // FileIO tests. 617 // FileIO tests.
568 IN_PROC_BROWSER_TEST_F(PPAPITest, FileIO) { 618 IN_PROC_BROWSER_TEST_F(PPAPITest, FileIO) {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 LIST_TEST(FileIO_ParallelReads) 663 LIST_TEST(FileIO_ParallelReads)
614 LIST_TEST(FileIO_ParallelWrites) 664 LIST_TEST(FileIO_ParallelWrites)
615 LIST_TEST(FileIO_NotAllowMixedReadWrite) 665 LIST_TEST(FileIO_NotAllowMixedReadWrite)
616 LIST_TEST(FileIO_ReadWriteSetLength) 666 LIST_TEST(FileIO_ReadWriteSetLength)
617 LIST_TEST(FileIO_ReadToArrayWriteSetLength) 667 LIST_TEST(FileIO_ReadToArrayWriteSetLength)
618 LIST_TEST(FileIO_TouchQuery) 668 LIST_TEST(FileIO_TouchQuery)
619 // The following test requires PPB_FileIO_Trusted, not available in NaCl. 669 // The following test requires PPB_FileIO_Trusted, not available in NaCl.
620 LIST_TEST(DISABLED_FileIO_WillWriteWillSetLength) 670 LIST_TEST(DISABLED_FileIO_WillWriteWillSetLength)
621 ); 671 );
622 } 672 }
673 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, FileIO) {
674 RunTestViaHTTP(
675 LIST_TEST(FileIO_Open)
676 LIST_TEST(FileIO_AbortCalls)
677 LIST_TEST(FileIO_ParallelReads)
678 LIST_TEST(FileIO_ParallelWrites)
679 LIST_TEST(FileIO_NotAllowMixedReadWrite)
680 LIST_TEST(FileIO_ReadWriteSetLength)
681 LIST_TEST(FileIO_ReadToArrayWriteSetLength)
682 LIST_TEST(FileIO_TouchQuery)
683 // The following test requires PPB_FileIO_Trusted, not available in NaCl.
684 LIST_TEST(DISABLED_FileIO_WillWriteWillSetLength)
685 );
686 }
623 687
624 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef) 688 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef)
625 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef) 689 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef)
626 TEST_PPAPI_NACL(FileRef) 690 TEST_PPAPI_NACL(FileRef)
627 691
628 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem) 692 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem)
629 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem) 693 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem)
630 694
631 // PPAPINaClTest.FileSystem times out consistently on Windows and Mac. 695 // PPAPINaClTest.FileSystem times out consistently on Windows and Mac.
632 // http://crbug.com/130372 696 // http://crbug.com/130372
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 LIST_TEST(NetAddressPrivateUntrusted_AreEqual) 771 LIST_TEST(NetAddressPrivateUntrusted_AreEqual)
708 LIST_TEST(NetAddressPrivateUntrusted_AreHostsEqual) 772 LIST_TEST(NetAddressPrivateUntrusted_AreHostsEqual)
709 LIST_TEST(NetAddressPrivateUntrusted_Describe) 773 LIST_TEST(NetAddressPrivateUntrusted_Describe)
710 LIST_TEST(NetAddressPrivateUntrusted_ReplacePort) 774 LIST_TEST(NetAddressPrivateUntrusted_ReplacePort)
711 LIST_TEST(NetAddressPrivateUntrusted_GetAnyAddress) 775 LIST_TEST(NetAddressPrivateUntrusted_GetAnyAddress)
712 LIST_TEST(NetAddressPrivateUntrusted_GetFamily) 776 LIST_TEST(NetAddressPrivateUntrusted_GetFamily)
713 LIST_TEST(NetAddressPrivateUntrusted_GetPort) 777 LIST_TEST(NetAddressPrivateUntrusted_GetPort)
714 LIST_TEST(NetAddressPrivateUntrusted_GetAddress) 778 LIST_TEST(NetAddressPrivateUntrusted_GetAddress)
715 ); 779 );
716 } 780 }
781 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetAddress) {
782 RunTestViaHTTP(
783 LIST_TEST(NetAddressPrivateUntrusted_AreEqual)
784 LIST_TEST(NetAddressPrivateUntrusted_AreHostsEqual)
785 LIST_TEST(NetAddressPrivateUntrusted_Describe)
786 LIST_TEST(NetAddressPrivateUntrusted_ReplacePort)
787 LIST_TEST(NetAddressPrivateUntrusted_GetAnyAddress)
788 LIST_TEST(NetAddressPrivateUntrusted_GetFamily)
789 LIST_TEST(NetAddressPrivateUntrusted_GetPort)
790 LIST_TEST(NetAddressPrivateUntrusted_GetAddress)
791 );
792 }
717 793
718 // NetworkMonitor tests. 794 // NetworkMonitor tests.
719 IN_PROC_BROWSER_TEST_F(PPAPITest, NetworkMonitor) { 795 IN_PROC_BROWSER_TEST_F(PPAPITest, NetworkMonitor) {
720 RunTestViaHTTP( 796 RunTestViaHTTP(
721 LIST_TEST(NetworkMonitorPrivate_Basic) 797 LIST_TEST(NetworkMonitorPrivate_Basic)
722 LIST_TEST(NetworkMonitorPrivate_2Monitors) 798 LIST_TEST(NetworkMonitorPrivate_2Monitors)
723 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback) 799 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback)
724 LIST_TEST(NetworkMonitorPrivate_ListObserver) 800 LIST_TEST(NetworkMonitorPrivate_ListObserver)
725 ); 801 );
726 } 802 }
(...skipping 14 matching lines...) Expand all
741 ); 817 );
742 } 818 }
743 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(NetworkMonitor)) { 819 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(NetworkMonitor)) {
744 RunTestViaHTTP( 820 RunTestViaHTTP(
745 LIST_TEST(NetworkMonitorPrivate_Basic) 821 LIST_TEST(NetworkMonitorPrivate_Basic)
746 LIST_TEST(NetworkMonitorPrivate_2Monitors) 822 LIST_TEST(NetworkMonitorPrivate_2Monitors)
747 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback) 823 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback)
748 LIST_TEST(NetworkMonitorPrivate_ListObserver) 824 LIST_TEST(NetworkMonitorPrivate_ListObserver)
749 ); 825 );
750 } 826 }
827 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetworkMonitor) {
828 RunTestViaHTTP(
829 LIST_TEST(NetworkMonitorPrivate_Basic)
830 LIST_TEST(NetworkMonitorPrivate_2Monitors)
831 LIST_TEST(NetworkMonitorPrivate_DeleteInCallback)
832 LIST_TEST(NetworkMonitorPrivate_ListObserver)
833 );
834 }
751 835
752 // Flash tests. 836 // Flash tests.
753 IN_PROC_BROWSER_TEST_F(PPAPITest, Flash) { 837 IN_PROC_BROWSER_TEST_F(PPAPITest, Flash) {
754 RunTestViaHTTP( 838 RunTestViaHTTP(
755 LIST_TEST(Flash_SetInstanceAlwaysOnTop) 839 LIST_TEST(Flash_SetInstanceAlwaysOnTop)
756 LIST_TEST(Flash_GetCommandLineArgs) 840 LIST_TEST(Flash_GetCommandLineArgs)
757 ); 841 );
758 } 842 }
759 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, Flash) { 843 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, Flash) {
760 RunTestViaHTTP( 844 RunTestViaHTTP(
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 LIST_TEST(WebSocket_UtilityGetURL) 972 LIST_TEST(WebSocket_UtilityGetURL)
889 LIST_TEST(WebSocket_UtilityValidConnect) 973 LIST_TEST(WebSocket_UtilityValidConnect)
890 LIST_TEST(WebSocket_UtilityInvalidClose) 974 LIST_TEST(WebSocket_UtilityInvalidClose)
891 LIST_TEST(WebSocket_UtilityValidClose) 975 LIST_TEST(WebSocket_UtilityValidClose)
892 LIST_TEST(WebSocket_UtilityGetProtocol) 976 LIST_TEST(WebSocket_UtilityGetProtocol)
893 LIST_TEST(WebSocket_UtilityTextSendReceive) 977 LIST_TEST(WebSocket_UtilityTextSendReceive)
894 LIST_TEST(WebSocket_UtilityBinarySendReceive) 978 LIST_TEST(WebSocket_UtilityBinarySendReceive)
895 LIST_TEST(WebSocket_UtilityBufferedAmount)); 979 LIST_TEST(WebSocket_UtilityBufferedAmount));
896 } 980 }
897 981
982 // PNaCl WebSocket tests
983 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket) {
984 RunTestWithWebSocketServer(
985 LIST_TEST(WebSocket_IsWebSocket)
986 LIST_TEST(WebSocket_UninitializedPropertiesAccess)
987 LIST_TEST(WebSocket_InvalidConnect)
988 LIST_TEST(WebSocket_Protocols)
989 LIST_TEST(WebSocket_GetURL)
990 LIST_TEST(WebSocket_ValidConnect)
991 LIST_TEST(WebSocket_InvalidClose)
992 LIST_TEST(WebSocket_ValidClose)
993 LIST_TEST(WebSocket_GetProtocol)
994 LIST_TEST(WebSocket_TextSendReceive)
995 LIST_TEST(WebSocket_BinarySendReceive)
996 LIST_TEST(WebSocket_StressedSendReceive)
997 LIST_TEST(WebSocket_BufferedAmount)
998 LIST_TEST(WebSocket_AbortCallsWithCallback)
999 LIST_TEST(WebSocket_AbortSendMessageCall)
1000 LIST_TEST(WebSocket_AbortCloseCall)
1001 LIST_TEST(WebSocket_AbortReceiveMessageCall)
1002 LIST_TEST(WebSocket_CcInterfaces)
1003 LIST_TEST(WebSocket_UtilityInvalidConnect)
1004 LIST_TEST(WebSocket_UtilityProtocols)
1005 LIST_TEST(WebSocket_UtilityGetURL)
1006 LIST_TEST(WebSocket_UtilityValidConnect)
1007 LIST_TEST(WebSocket_UtilityInvalidClose)
1008 LIST_TEST(WebSocket_UtilityValidClose)
1009 LIST_TEST(WebSocket_UtilityGetProtocol)
1010 LIST_TEST(WebSocket_UtilityTextSendReceive)
1011 LIST_TEST(WebSocket_UtilityBinarySendReceive)
1012 LIST_TEST(WebSocket_UtilityBufferedAmount));
1013 }
1014
1015
898 // In-process AudioConfig tests 1016 // In-process AudioConfig tests
899 IN_PROC_BROWSER_TEST_F(PPAPITest, AudioConfig) { 1017 IN_PROC_BROWSER_TEST_F(PPAPITest, AudioConfig) {
900 RunTest( 1018 RunTest(
901 LIST_TEST(AudioConfig_RecommendSampleRate) 1019 LIST_TEST(AudioConfig_RecommendSampleRate)
902 LIST_TEST(AudioConfig_ValidConfigs) 1020 LIST_TEST(AudioConfig_ValidConfigs)
903 LIST_TEST(AudioConfig_InvalidConfigs)); 1021 LIST_TEST(AudioConfig_InvalidConfigs));
904 } 1022 }
905 1023
906 // Out-of-process AudioConfig tests 1024 // Out-of-process AudioConfig tests
907 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, AudioConfig) { 1025 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, AudioConfig) {
(...skipping 12 matching lines...) Expand all
920 } 1038 }
921 1039
922 // NaClGLibc AudioConfig tests 1040 // NaClGLibc AudioConfig tests
923 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(AudioConfig)) { 1041 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(AudioConfig)) {
924 RunTestViaHTTP( 1042 RunTestViaHTTP(
925 LIST_TEST(AudioConfig_RecommendSampleRate) 1043 LIST_TEST(AudioConfig_RecommendSampleRate)
926 LIST_TEST(AudioConfig_ValidConfigs) 1044 LIST_TEST(AudioConfig_ValidConfigs)
927 LIST_TEST(AudioConfig_InvalidConfigs)); 1045 LIST_TEST(AudioConfig_InvalidConfigs));
928 } 1046 }
929 1047
1048 // PNaCl AudioConfig tests
1049 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, AudioConfig) {
1050 RunTestViaHTTP(
1051 LIST_TEST(AudioConfig_RecommendSampleRate)
1052 LIST_TEST(AudioConfig_ValidConfigs)
1053 LIST_TEST(AudioConfig_InvalidConfigs));
1054 }
1055
1056
930 IN_PROC_BROWSER_TEST_F(PPAPITest, Audio) { 1057 IN_PROC_BROWSER_TEST_F(PPAPITest, Audio) {
931 RunTest(LIST_TEST(Audio_Creation) 1058 RunTest(LIST_TEST(Audio_Creation)
932 LIST_TEST(Audio_DestroyNoStop) 1059 LIST_TEST(Audio_DestroyNoStop)
933 LIST_TEST(Audio_Failures) 1060 LIST_TEST(Audio_Failures)
934 LIST_TEST(Audio_AudioCallback1) 1061 LIST_TEST(Audio_AudioCallback1)
935 LIST_TEST(Audio_AudioCallback2)); 1062 LIST_TEST(Audio_AudioCallback2));
936 } 1063 }
937 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, Audio) { 1064 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, Audio) {
938 RunTest(LIST_TEST(Audio_Creation) 1065 RunTest(LIST_TEST(Audio_Creation)
939 LIST_TEST(Audio_DestroyNoStop) 1066 LIST_TEST(Audio_DestroyNoStop)
940 LIST_TEST(Audio_Failures) 1067 LIST_TEST(Audio_Failures)
941 LIST_TEST(Audio_AudioCallback1) 1068 LIST_TEST(Audio_AudioCallback1)
942 LIST_TEST(Audio_AudioCallback2)); 1069 LIST_TEST(Audio_AudioCallback2));
943 } 1070 }
944 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, Audio) { 1071 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, Audio) {
945 RunTestViaHTTP(LIST_TEST(Audio_Creation) 1072 RunTestViaHTTP(LIST_TEST(Audio_Creation)
946 LIST_TEST(Audio_DestroyNoStop) 1073 LIST_TEST(Audio_DestroyNoStop)
947 LIST_TEST(Audio_Failures) 1074 LIST_TEST(Audio_Failures)
948 LIST_TEST(Audio_AudioCallback1) 1075 LIST_TEST(Audio_AudioCallback1)
949 LIST_TEST(Audio_AudioCallback2)); 1076 LIST_TEST(Audio_AudioCallback2));
950 } 1077 }
951 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(Audio)) { 1078 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(Audio)) {
952 RunTestViaHTTP(LIST_TEST(Audio_Creation) 1079 RunTestViaHTTP(LIST_TEST(Audio_Creation)
953 LIST_TEST(Audio_DestroyNoStop) 1080 LIST_TEST(Audio_DestroyNoStop)
954 LIST_TEST(Audio_Failures) 1081 LIST_TEST(Audio_Failures)
955 LIST_TEST(Audio_AudioCallback1) 1082 LIST_TEST(Audio_AudioCallback1)
956 LIST_TEST(Audio_AudioCallback2)); 1083 LIST_TEST(Audio_AudioCallback2));
957 } 1084 }
1085 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, Audio) {
1086 RunTestViaHTTP(LIST_TEST(Audio_Creation)
1087 LIST_TEST(Audio_DestroyNoStop)
1088 LIST_TEST(Audio_Failures)
1089 LIST_TEST(Audio_AudioCallback1)
1090 LIST_TEST(Audio_AudioCallback2));
1091 }
958 1092
959 TEST_PPAPI_IN_PROCESS(View_CreatedVisible); 1093 TEST_PPAPI_IN_PROCESS(View_CreatedVisible);
960 TEST_PPAPI_OUT_OF_PROCESS(View_CreatedVisible); 1094 TEST_PPAPI_OUT_OF_PROCESS(View_CreatedVisible);
961 TEST_PPAPI_NACL(View_CreatedVisible); 1095 TEST_PPAPI_NACL(View_CreatedVisible);
962 // This test ensures that plugins created in a background tab have their 1096 // This test ensures that plugins created in a background tab have their
963 // initial visibility set to false. We don't bother testing in-process for this 1097 // initial visibility set to false. We don't bother testing in-process for this
964 // custom test since the out of process code also exercises in-process. 1098 // custom test since the out of process code also exercises in-process.
965 1099
966 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_CreateInvisible) { 1100 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_CreateInvisible) {
967 // Make a second tab in the foreground. 1101 // Make a second tab in the foreground.
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 LIST_TEST(View_ClipChange)); 1165 LIST_TEST(View_ClipChange));
1032 } 1166 }
1033 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, View) { 1167 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, View) {
1034 RunTestViaHTTP(LIST_TEST(View_SizeChange) 1168 RunTestViaHTTP(LIST_TEST(View_SizeChange)
1035 LIST_TEST(View_ClipChange)); 1169 LIST_TEST(View_ClipChange));
1036 } 1170 }
1037 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, View) { 1171 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, View) {
1038 RunTestViaHTTP(LIST_TEST(View_SizeChange) 1172 RunTestViaHTTP(LIST_TEST(View_SizeChange)
1039 LIST_TEST(View_ClipChange)); 1173 LIST_TEST(View_ClipChange));
1040 } 1174 }
1175 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, View) {
1176 RunTestViaHTTP(LIST_TEST(View_SizeChange)
1177 LIST_TEST(View_ClipChange));
1178 }
1041 1179
1042 IN_PROC_BROWSER_TEST_F(PPAPITest, ResourceArray) { 1180 IN_PROC_BROWSER_TEST_F(PPAPITest, ResourceArray) {
1043 RunTest(LIST_TEST(ResourceArray_Basics) 1181 RunTest(LIST_TEST(ResourceArray_Basics)
1044 LIST_TEST(ResourceArray_OutOfRangeAccess) 1182 LIST_TEST(ResourceArray_OutOfRangeAccess)
1045 LIST_TEST(ResourceArray_EmptyArray) 1183 LIST_TEST(ResourceArray_EmptyArray)
1046 LIST_TEST(ResourceArray_InvalidElement)); 1184 LIST_TEST(ResourceArray_InvalidElement));
1047 } 1185 }
1048 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, ResourceArray) { 1186 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, ResourceArray) {
1049 RunTest(LIST_TEST(ResourceArray_Basics) 1187 RunTest(LIST_TEST(ResourceArray_Basics)
1050 LIST_TEST(ResourceArray_OutOfRangeAccess) 1188 LIST_TEST(ResourceArray_OutOfRangeAccess)
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
1094 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen 1232 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen
1095 #else 1233 #else
1096 #define MAYBE_FlashFullscreen FlashFullscreen 1234 #define MAYBE_FlashFullscreen FlashFullscreen
1097 #endif 1235 #endif
1098 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen) 1236 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen)
1099 1237
1100 TEST_PPAPI_IN_PROCESS(TalkPrivate) 1238 TEST_PPAPI_IN_PROCESS(TalkPrivate)
1101 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 1239 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
1102 1240
1103 #endif // ADDRESS_SANITIZER 1241 #endif // ADDRESS_SANITIZER
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/test/ppapi/ppapi_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698