| Index: base/i18n/file_util_icu.cc
|
| diff --git a/base/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc
|
| index f6e2c2956f4f189073e75a5c29125bf70c218c05..1b056b26672f33608b9890b3179f72f4f2f74c47 100644
|
| --- a/base/i18n/file_util_icu.cc
|
| +++ b/base/i18n/file_util_icu.cc
|
| @@ -115,10 +115,6 @@ void ReplaceIllegalCharactersInPath(FilePath::StringType* file_name,
|
| // Mac uses UTF-8 encoding for filenames.
|
| U8_NEXT(file_name->data(), cursor, static_cast<int>(file_name->length()),
|
| code_point);
|
| -#elif defined(OS_WIN)
|
| - // Windows uses UTF-16 encoding for filenames.
|
| - U16_NEXT(file_name->data(), cursor, static_cast<int>(file_name->length()),
|
| - code_point);
|
| #elif defined(OS_POSIX)
|
| // Linux doesn't actually define an encoding. It basically allows anything
|
| // except for a few special ASCII characters.
|
| @@ -151,11 +147,7 @@ bool LocaleAwareCompareFilenames(const FilePath& a, const FilePath& b) {
|
| // Make it case-sensitive.
|
| collator->setStrength(icu::Collator::TERTIARY);
|
|
|
| -#if defined(OS_WIN)
|
| - return CompareString16WithCollator(*collator, WideToUTF16(a.value()),
|
| - WideToUTF16(b.value())) == UCOL_LESS;
|
| -
|
| -#elif defined(OS_POSIX)
|
| +#if defined(OS_POSIX)
|
| // On linux, the file system encoding is not defined. We assume
|
| // SysNativeMBToWide takes care of it.
|
| return CompareString16WithCollator(
|
|
|