summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 10:05:03 +0000
committermarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 10:05:03 +0000
commit58ac52763177863e6aba103760b1dbbf48b8a5ec (patch)
tree5bdcf8439be650ef1d8a0d4d27b75677443f3830
parent1994eca5a9a0ab55b19fe9f6a1f5645771ca7748 (diff)
downloadchromium_src-58ac52763177863e6aba103760b1dbbf48b8a5ec.zip
chromium_src-58ac52763177863e6aba103760b1dbbf48b8a5ec.tar.gz
chromium_src-58ac52763177863e6aba103760b1dbbf48b8a5ec.tar.bz2
Disable ObfuscatedFileUtilTest.TestQuotaOnCopyFile on win / android.
BUG=176470 TBR=tzik Review URL: https://codereview.chromium.org/12262063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182658 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/fileapi/obfuscated_file_util_unittest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_util_unittest.cc
index 9caca8f..946932c 100644
--- a/webkit/fileapi/obfuscated_file_util_unittest.cc
+++ b/webkit/fileapi/obfuscated_file_util_unittest.cc
@@ -1931,7 +1931,13 @@ TEST_F(ObfuscatedFileUtilTest, TestFileEnumeratorTimestamp) {
EXPECT_EQ(2, count);
}
-TEST_F(ObfuscatedFileUtilTest, TestQuotaOnCopyFile) {
+// crbug.com/176470
+#if defined(OS_WIN) || defined(OS_ANDROID)
+#define MAYBE_TestQuotaOnCopyFile DISABLED_TestQuotaOnCopyFile
+#else
+#define MAYBE_TestQuotaOnCopyFile TestQuotaOnCopyFile
+#endif
+TEST_F(ObfuscatedFileUtilTest, MAYBE_TestQuotaOnCopyFile) {
FileSystemURL from_file(CreateURLFromUTF8("fromfile"));
FileSystemURL obstacle_file(CreateURLFromUTF8("obstaclefile"));
FileSystemURL to_file1(CreateURLFromUTF8("tofile1"));