Index: base/files/file_path_unittest.cc |
diff --git a/base/files/file_path_unittest.cc b/base/files/file_path_unittest.cc |
index bc0e8432e0e1466581a37208d8b8d29e343b458b..703a2ad160f81a14a3c162ecead6cc6c8367bace 100644 |
--- a/base/files/file_path_unittest.cc |
+++ b/base/files/file_path_unittest.cc |
@@ -86,9 +86,6 @@ TEST_F(FilePathTest, DirName) { |
{ FPL("{:"), FPL(".") }, |
{ FPL("\xB3:"), FPL(".") }, |
{ FPL("\xC5:"), FPL(".") }, |
-#if defined(OS_WIN) |
- { FPL("\x0143:"), FPL(".") }, |
-#endif // OS_WIN |
#if defined(FILE_PATH_USES_DRIVE_LETTERS) |
{ FPL("c:"), FPL("c:") }, |
{ FPL("C:"), FPL("C:") }, |
@@ -174,9 +171,6 @@ TEST_F(FilePathTest, BaseName) { |
{ FPL("{:"), FPL("{:") }, |
{ FPL("\xB3:"), FPL("\xB3:") }, |
{ FPL("\xC5:"), FPL("\xC5:") }, |
-#if defined(OS_WIN) |
- { FPL("\x0143:"), FPL("\x0143:") }, |
-#endif // OS_WIN |
#if defined(FILE_PATH_USES_DRIVE_LETTERS) |
{ FPL("c:"), FPL("") }, |
{ FPL("C:"), FPL("") }, |
@@ -313,11 +307,7 @@ TEST_F(FilePathTest, Append) { |
// TODO(erikkay): It would be nice to have a unicode test append value to |
// handle the case when AppendASCII is passed UTF8 |
-#if defined(OS_WIN) |
- std::string ascii = WideToUTF8(leaf); |
-#elif defined(OS_POSIX) |
std::string ascii = leaf; |
-#endif |
observed_str = root.AppendASCII(ascii); |
EXPECT_EQ(FilePath::StringType(cases[i].expected), observed_str.value()) << |
"i: " << i << ", root: " << root.value() << ", leaf: " << leaf; |
@@ -990,7 +980,7 @@ TEST_F(FilePathTest, MatchesExtension) { |
#endif // FILE_PATH_USES_DRIVE_LETTERS |
{ { FPL("/bar/foo.txt.dll"), FPL(".txt") }, false}, |
{ { FPL("/bar/foo.txt"), FPL(".txt") }, true}, |
-#if defined(OS_WIN) || defined(OS_MACOSX) |
+#if defined(OS_MACOSX) |
// Umlauts A, O, U: direct comparison, and upper case vs. lower case |
{ { FPL("foo.\u00E4\u00F6\u00FC"), FPL(".\u00E4\u00F6\u00FC") }, true}, |
{ { FPL("foo.\u00C4\u00D6\u00DC"), FPL(".\u00E4\u00F6\u00FC") }, true}, |
@@ -1037,7 +1027,7 @@ TEST_F(FilePathTest, CompareIgnoreCase) { |
{ { FPL("\u00DF"), FPL("\u1E9E") }, -1}, |
{ { FPL("SS"), FPL("\u00DF") }, -1}, |
{ { FPL("SS"), FPL("\u1E9E") }, -1}, |
-#if defined(OS_WIN) || defined(OS_MACOSX) |
+#if defined(OS_MACOSX) |
// Umlauts A, O, U: direct comparison, and upper case vs. lower case |
{ { FPL("\u00E4\u00F6\u00FC"), FPL("\u00E4\u00F6\u00FC") }, 0}, |
{ { FPL("\u00C4\u00D6\u00DC"), FPL("\u00E4\u00F6\u00FC") }, 0}, |