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

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

Issue 301723003: Disable PPAPITest.FileIO on Win too. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 LIST_TEST(FileIO_RequestOSFileHandle) \ 718 LIST_TEST(FileIO_RequestOSFileHandle) \
719 LIST_TEST(FileIO_RequestOSFileHandleWithOpenExclusive) \ 719 LIST_TEST(FileIO_RequestOSFileHandleWithOpenExclusive) \
720 LIST_TEST(FileIO_Mmap) \ 720 LIST_TEST(FileIO_Mmap) \
721 ) 721 )
722 722
723 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) 723 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
724 // TODO(erg): linux_aura bringup: http://crbug.com/318961 724 // TODO(erg): linux_aura bringup: http://crbug.com/318961
725 #define MAYBE_FileIO DISABLED_FileIO 725 #define MAYBE_FileIO DISABLED_FileIO
726 #define MAYBE_FileIO_Private DISABLED_FileIO_Private 726 #define MAYBE_FileIO_Private DISABLED_FileIO_Private
727 #else 727 #else
728 // Flaky on Mac. http://crbug.com/377599 728 // Flaky on Mac and Win. http://crbug.com/377599
729 # if defined(OS_MACOSX) 729 #if defined(OS_MACOSX) || defined(OS_WIN)
730 #define MAYBE_FileIO DISABLED_FileIO 730 #define MAYBE_FileIO DISABLED_FileIO
731 # else 731 #else
732 #define MAYBE_FileIO FileIO 732 #define MAYBE_FileIO FileIO
733 # endif // defined(OS_MACOSX) 733 #endif // OS_MACOSX || OS_WIN
734 #define MAYBE_FileIO_Private FileIO_Private 734 #define MAYBE_FileIO_Private FileIO_Private
735 #endif 735 #endif
736 736
737 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_FileIO) { 737 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_FileIO) {
738 RUN_FILEIO_SUBTESTS; 738 RUN_FILEIO_SUBTESTS;
739 } 739 }
740 IN_PROC_BROWSER_TEST_F(PPAPIPrivateTest, MAYBE_FileIO_Private) { 740 IN_PROC_BROWSER_TEST_F(PPAPIPrivateTest, MAYBE_FileIO_Private) {
741 RUN_FILEIO_PRIVATE_SUBTESTS; 741 RUN_FILEIO_PRIVATE_SUBTESTS;
742 } 742 }
743 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FileIO) { 743 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FileIO) {
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
1368 LIST_TEST(FlashDRM_GetHmonitor) 1368 LIST_TEST(FlashDRM_GetHmonitor)
1369 LIST_TEST(FlashDRM_GetVoucherFile)); 1369 LIST_TEST(FlashDRM_GetVoucherFile));
1370 } 1370 }
1371 1371
1372 TEST_PPAPI_IN_PROCESS(TalkPrivate) 1372 TEST_PPAPI_IN_PROCESS(TalkPrivate)
1373 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 1373 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
1374 1374
1375 #if defined(OS_CHROMEOS) 1375 #if defined(OS_CHROMEOS)
1376 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) 1376 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)
1377 #endif 1377 #endif
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