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

Side by Side Diff: chrome/test/ui/ppapi_uitest.cc

Issue 10660010: Fix flaky PPAPITest.FileIO_NotAllowMixedReadWrite, re-enable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix stupid compile error Created 8 years, 6 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 | ppapi/tests/test_file_io.cc » ('j') | ppapi/tests/test_file_io.cc » ('J')
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/ui/ppapi_uitest.h" 5 #include "chrome/test/ui/ppapi_uitest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 #if defined(OS_WIN) 804 #if defined(OS_WIN)
805 #define MAYBE_NACL_FileIO_TouchQuery DISABLED_FileIO_TouchQuery 805 #define MAYBE_NACL_FileIO_TouchQuery DISABLED_FileIO_TouchQuery
806 #else 806 #else
807 #define MAYBE_NACL_FileIO_TouchQuery MAYBE_FileIO_TouchQuery 807 #define MAYBE_NACL_FileIO_TouchQuery MAYBE_FileIO_TouchQuery
808 #endif 808 #endif
809 809
810 TEST_PPAPI_NACL_VIA_HTTP(FileIO_Open) 810 TEST_PPAPI_NACL_VIA_HTTP(FileIO_Open)
811 TEST_PPAPI_NACL_VIA_HTTP(FileIO_AbortCalls) 811 TEST_PPAPI_NACL_VIA_HTTP(FileIO_AbortCalls)
812 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_FileIO_ParallelReads) 812 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_FileIO_ParallelReads)
813 TEST_PPAPI_NACL_VIA_HTTP(FileIO_ParallelWrites) 813 TEST_PPAPI_NACL_VIA_HTTP(FileIO_ParallelWrites)
814 // crbug.com/134442 814 TEST_PPAPI_NACL_VIA_HTTP(FileIO_NotAllowMixedReadWrite)
815 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_FileIO_NotAllowMixedReadWrite)
816 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_NACL_FileIO_TouchQuery) 815 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_NACL_FileIO_TouchQuery)
817 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_FileIO_ReadWriteSetLength) 816 TEST_PPAPI_NACL_VIA_HTTP(MAYBE_FileIO_ReadWriteSetLength)
818 // The following test requires PPB_FileIO_Trusted, not available in NaCl. 817 // The following test requires PPB_FileIO_Trusted, not available in NaCl.
819 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_FileIO_WillWriteWillSetLength) 818 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_FileIO_WillWriteWillSetLength)
820 819
821 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef) 820 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef)
822 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef) 821 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef)
823 TEST_PPAPI_NACL_VIA_HTTP(FileRef) 822 TEST_PPAPI_NACL_VIA_HTTP(FileRef)
824 823
825 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem) 824 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem)
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_RunWithoutQuit) 1111 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_RunWithoutQuit)
1113 1112
1114 TEST_PPAPI_IN_PROCESS(MouseCursor) 1113 TEST_PPAPI_IN_PROCESS(MouseCursor)
1115 TEST_PPAPI_OUT_OF_PROCESS(MouseCursor) 1114 TEST_PPAPI_OUT_OF_PROCESS(MouseCursor)
1116 TEST_PPAPI_NACL_VIA_HTTP(MouseCursor) 1115 TEST_PPAPI_NACL_VIA_HTTP(MouseCursor)
1117 1116
1118 // Only enabled in out-of-process mode. 1117 // Only enabled in out-of-process mode.
1119 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile) 1118 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile)
1120 1119
1121 #endif // ADDRESS_SANITIZER 1120 #endif // ADDRESS_SANITIZER
OLDNEW
« no previous file with comments | « no previous file | ppapi/tests/test_file_io.cc » ('j') | ppapi/tests/test_file_io.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698