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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11778002: NaCl: Re-enable the test FileIO_TouchQuery (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | « 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) 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 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_WillWriteWillSetLength) 590 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_WillWriteWillSetLength)
591 591
592 // PPAPINaclTest.FileIO_ParallelReads is flaky on Mac and Windows. 592 // PPAPINaclTest.FileIO_ParallelReads is flaky on Mac and Windows.
593 // http://crbug.com/121104 593 // http://crbug.com/121104
594 #if defined(OS_MACOSX) || defined(OS_WIN) 594 #if defined(OS_MACOSX) || defined(OS_WIN)
595 #define MAYBE_FileIO_ParallelReads DISABLED_FileIO_ParallelReads 595 #define MAYBE_FileIO_ParallelReads DISABLED_FileIO_ParallelReads
596 #else 596 #else
597 #define MAYBE_FileIO_ParallelReads FileIO_ParallelReads 597 #define MAYBE_FileIO_ParallelReads FileIO_ParallelReads
598 #endif 598 #endif
599 599
600 // PPAPINaclTest.FileIO_TouchQuery is flaky on Windows. http://crbug.com/130349
601 #if defined(OS_WIN)
602 #define MAYBE_NACL_FileIO_TouchQuery DISABLED_FileIO_TouchQuery
603 #else
604 #define MAYBE_NACL_FileIO_TouchQuery FileIO_TouchQuery
605 #endif
606
607 // PPAPINaclTest.FileIO_AbortCalls is often flaky on Windows. 600 // PPAPINaclTest.FileIO_AbortCalls is often flaky on Windows.
608 // http://crbug.com/160034 601 // http://crbug.com/160034
609 #if defined(OS_WIN) 602 #if defined(OS_WIN)
610 #define MAYBE_FileIO_AbortCalls DISABLED_FileIO_AbortCalls 603 #define MAYBE_FileIO_AbortCalls DISABLED_FileIO_AbortCalls
611 #else 604 #else
612 #define MAYBE_FileIO_AbortCalls FileIO_AbortCalls 605 #define MAYBE_FileIO_AbortCalls FileIO_AbortCalls
613 #endif 606 #endif
614 607
615 TEST_PPAPI_NACL_VIA_HTTP(FileIO_Open) 608 TEST_PPAPI_NACL_VIA_HTTP(FileIO_Open)
616 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_FileIO_AbortCalls) 609 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_FileIO_AbortCalls)
617 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_FileIO_ParallelReads) 610 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_FileIO_ParallelReads)
618 // http://crbug.com/167150 611 // http://crbug.com/167150
619 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_FileIO_ParallelWrites) 612 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_FileIO_ParallelWrites)
620 TEST_PPAPI_NACL_VIA_HTTP(FileIO_NotAllowMixedReadWrite) 613 TEST_PPAPI_NACL_VIA_HTTP(FileIO_NotAllowMixedReadWrite)
621 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_NACL_FileIO_TouchQuery) 614 TEST_PPAPI_NACL_VIA_HTTP(FileIO_TouchQuery)
622 TEST_PPAPI_NACL_VIA_HTTP(FileIO_ReadWriteSetLength) 615 TEST_PPAPI_NACL_VIA_HTTP(FileIO_ReadWriteSetLength)
623 TEST_PPAPI_NACL_VIA_HTTP(FileIO_ReadToArrayWriteSetLength) 616 TEST_PPAPI_NACL_VIA_HTTP(FileIO_ReadToArrayWriteSetLength)
624 // The following test requires PPB_FileIO_Trusted, not available in NaCl. 617 // The following test requires PPB_FileIO_Trusted, not available in NaCl.
625 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_FileIO_WillWriteWillSetLength) 618 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_FileIO_WillWriteWillSetLength)
626 619
627 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef) 620 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef)
628 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef) 621 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef)
629 TEST_PPAPI_NACL_VIA_HTTP(FileRef) 622 TEST_PPAPI_NACL_VIA_HTTP(FileRef)
630 623
631 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem) 624 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem)
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
955 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen 948 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen
956 #else 949 #else
957 #define MAYBE_FlashFullscreen FlashFullscreen 950 #define MAYBE_FlashFullscreen FlashFullscreen
958 #endif 951 #endif
959 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen) 952 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen)
960 953
961 TEST_PPAPI_IN_PROCESS(TalkPrivate) 954 TEST_PPAPI_IN_PROCESS(TalkPrivate)
962 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 955 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
963 956
964 #endif // ADDRESS_SANITIZER 957 #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