From 503d0387804c4ddf22a52857407e885ce737dbba Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Fri, 6 May 2011 08:36:26 +0000 Subject: FTP: split the directory listing parser test and re-enable it on TSan bots The test was disabled on TSan bots becuase it was taking too much time. This change converts one huge test which parses ~30 directory listings to ~30 separate test cases. This change also moves ToLower/ToUpper from ui/base/l10n_util to base/i18n/case_conversion so that they can be used in net/ftp. BUG=79022 Review URL: http://codereview.chromium.org/6905027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84413 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/enumerate_modules_model_win.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'chrome/browser/enumerate_modules_model_win.cc') diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc index 69315e9..78ea9d1 100644 --- a/chrome/browser/enumerate_modules_model_win.cc +++ b/chrome/browser/enumerate_modules_model_win.cc @@ -11,6 +11,7 @@ #include "base/environment.h" #include "base/file_path.h" #include "base/file_version_info_win.h" +#include "base/i18n/case_conversion.h" #include "base/metrics/histogram.h" #include "base/string_number_conversions.h" #include "base/string_util.h" @@ -274,7 +275,7 @@ void ModuleEnumerator::NormalizeModule(Module* module) { if (!ConvertToLongPath(path, &module->location)) module->location = path; - module->location = l10n_util::ToLower(module->location); + module->location = base::i18n::ToLower(module->location); // Location contains the filename, so the last slash is where the path // ends. @@ -586,8 +587,8 @@ void ModuleEnumerator::PreparePathMappings() { std::string path; if (environment->GetVar(WideToASCII(*variable).c_str(), &path)) { path_mapping_.push_back( - std::make_pair(l10n_util::ToLower(UTF8ToWide(path)) + L"\\", - L"%" + l10n_util::ToLower(*variable) + L"%")); + std::make_pair(base::i18n::WideToLower(UTF8ToWide(path)) + L"\\", + L"%" + base::i18n::ToLower(*variable) + L"%")); } } } -- cgit v1.1