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/tools/convert_dict | |
| 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/tools/convert_dict')
| -rw-r--r-- | chrome/tools/convert_dict/aff_reader.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/tools/convert_dict/aff_reader.cc b/chrome/tools/convert_dict/aff_reader.cc index 2ea8301..33fa522 100644 --- a/chrome/tools/convert_dict/aff_reader.cc +++ b/chrome/tools/convert_dict/aff_reader.cc @@ -7,6 +7,7 @@ #include <algorithm> #include "base/file_util.h" +#include "base/i18n/icu_string_conversions.h" #include "base/string_util.h" #include "chrome/tools/convert_dict/hunspell_reader.h" @@ -133,8 +134,8 @@ bool AffReader::Read() { bool AffReader::EncodingToUTF8(const std::string& encoded, std::string* utf8) const { std::wstring wide_word; - if (!CodepageToWide(encoded, encoding(), - OnStringUtilConversionError::FAIL, &wide_word)) + if (!base::CodepageToWide(encoded, encoding(), + base::OnStringConversionError::FAIL, &wide_word)) return false; *utf8 = WideToUTF8(wide_word); return true; |