FilePath: add a convertor to ASCII

chrome/common/extensions/extension_l10n_util.cc

Index: chrome/common/extensions/extension_l10n_util.cc
diff --git a/chrome/common/extensions/extension_l10n_util.cc b/chrome/common/extensions/extension_l10n_util.cc
index dff8f5e69c81f0046c3cca39d1f77d3f38ca6dbf..dad4d06cebd25cbc147f9b421a52a820f2f41884 100644
--- a/chrome/common/extensions/extension_l10n_util.cc
+++ b/chrome/common/extensions/extension_l10n_util.cc
@@ -277,13 +277,18 @@ bool ShouldSkipValidation(const FilePath& locales_path,
   // skipping any strings with '.'. This happens sometimes, for example with
   // '.svn' directories.
   FilePath relative_path;
-  if (!locales_path.AppendRelativePath(locale_path, &relative_path))
+  if (!locales_path.AppendRelativePath(locale_path, &relative_path)) {
     NOTREACHED();
-  std::wstring subdir(relative_path.ToWStringHack());
-  if (std::find(subdir.begin(), subdir.end(), L'.') != subdir.end())
+    return true;
+  }
+  std::string subdir = relative_path.MaybeAsASCII();
+  if (subdir.empty())
+    return true;  // Non-ASCII.
+
+  if (std::find(subdir.begin(), subdir.end(), '.') != subdir.end())
     return true;
 
-  if (all_locales.find(WideToASCII(subdir)) == all_locales.end())
+  if (all_locales.find(subdir) == all_locales.end())
     return true;
 
   return false;