diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-06 08:36:26 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-06 08:36:26 +0000 |
| commit | 503d0387804c4ddf22a52857407e885ce737dbba (patch) | |
| tree | b207cd83412330671e898e7c9063da60338be86f /chrome/browser/instant/instant_loader.cc | |
| parent | cc7b9ccdc9f6eb94a89c0ce6f8e8af341eea4370 (diff) | |
| download | chromium_src-503d0387804c4ddf22a52857407e885ce737dbba.zip chromium_src-503d0387804c4ddf22a52857407e885ce737dbba.tar.gz chromium_src-503d0387804c4ddf22a52857407e885ce737dbba.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/instant/instant_loader.cc')
| -rw-r--r-- | chrome/browser/instant/instant_loader.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index a1920a0..ca99bea 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -10,6 +10,7 @@ #include <vector> #include "base/command_line.h" +#include "base/i18n/case_conversion.h" #include "base/string_number_conversions.h" #include "base/timer.h" #include "base/utf_string_conversions.h" @@ -685,9 +686,9 @@ bool InstantLoader::Update(TabContentsWrapper* tab_contents, host->Send(new ViewMsg_SearchBoxChange( host->routing_id(), user_text_, verbatim, text_length, text_length)); - string16 complete_suggested_text_lower = l10n_util::ToLower( + string16 complete_suggested_text_lower = base::i18n::ToLower( complete_suggested_text_); - string16 user_text_lower = l10n_util::ToLower(user_text_); + string16 user_text_lower = base::i18n::ToLower(user_text_); if (!verbatim && complete_suggested_text_lower.size() > user_text_lower.size() && !complete_suggested_text_lower.compare(0, user_text_lower.size(), @@ -841,8 +842,8 @@ void InstantLoader::SetCompleteSuggestedText( return; } - string16 user_text_lower = l10n_util::ToLower(user_text_); - string16 complete_suggested_text_lower = l10n_util::ToLower( + string16 user_text_lower = base::i18n::ToLower(user_text_); + string16 complete_suggested_text_lower = base::i18n::ToLower( complete_suggested_text); last_suggestion_.clear(); if (user_text_lower.compare(0, user_text_lower.size(), |