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 /webkit/appcache/manifest_parser.cc | |
| 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 'webkit/appcache/manifest_parser.cc')
| -rw-r--r-- | webkit/appcache/manifest_parser.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/appcache/manifest_parser.cc b/webkit/appcache/manifest_parser.cc index 4782ce5..652582a 100644 --- a/webkit/appcache/manifest_parser.cc +++ b/webkit/appcache/manifest_parser.cc @@ -31,8 +31,9 @@ #include "webkit/appcache/manifest_parser.h" +#include "base/i18n/icu_string_conversions.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" namespace appcache { @@ -58,8 +59,8 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length, std::wstring data_string; // TODO(jennb): cannot do UTF8ToWide(data, length, &data_string); // until UTF8ToWide uses 0xFFFD Unicode replacement character. - CodepageToWide(std::string(data, length), "UTF-8", - OnStringUtilConversionError::SUBSTITUTE, &data_string); + base::CodepageToWide(std::string(data, length), base::kCodepageUTF8, + base::OnStringConversionError::SUBSTITUTE, &data_string); const wchar_t* p = data_string.c_str(); const wchar_t* end = p + data_string.length(); |