diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-10 20:40:50 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-10 20:40:50 +0000 |
| commit | d6e58c6ef48f52cce6cdf781c5a507e254322425 (patch) | |
| tree | 274e82d3fa22052761a146eaed25d862744633af /chrome/browser/autocomplete | |
| parent | 3522bda4050a25b9020d9c224e9dfc89439e2f5e (diff) | |
| download | chromium_src-d6e58c6ef48f52cce6cdf781c5a507e254322425.zip chromium_src-d6e58c6ef48f52cce6cdf781c5a507e254322425.tar.gz chromium_src-d6e58c6ef48f52cce6cdf781c5a507e254322425.tar.bz2 | |
Remove the dependency on i18n/icu_string_conversions from base/string_util.h.
Fix up all files requireing this header to include it directly. Split out the
ICU-dependent string util unit tests into a new file
base/i18n/icu_string_util_unittest.cc
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/269034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28674 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/search_provider.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index 5c9931c..e024280 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -5,6 +5,7 @@ #include "chrome/browser/autocomplete/search_provider.h" #include "app/l10n_util.h" +#include "base/i18n/icu_string_conversions.h" #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/autocomplete/keyword_provider.h" @@ -165,8 +166,9 @@ void SearchProvider::OnURLFetchComplete(const URLFetcher* source, if (response_headers->GetCharset(&charset)) { std::wstring wide_data; // TODO(jungshik): Switch to CodePageToUTF8 after it's added. - if (CodepageToWide(data, charset.c_str(), - OnStringUtilConversionError::FAIL, &wide_data)) + if (base::CodepageToWide(data, charset.c_str(), + base::OnStringConversionError::FAIL, + &wide_data)) json_data = WideToUTF8(wide_data); } } |