diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 11:24:49 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 11:24:49 +0000 |
| commit | 7fe8fd8c2ceff4e7b5d79dd82e367a53c695cd75 (patch) | |
| tree | 3617f0b62cf2f87e95f816f51384fc544593ce52 | |
| parent | 40b87a1f461b53ae060e3844df246508e340e584 (diff) | |
| download | chromium_src-7fe8fd8c2ceff4e7b5d79dd82e367a53c695cd75.zip chromium_src-7fe8fd8c2ceff4e7b5d79dd82e367a53c695cd75.tar.gz chromium_src-7fe8fd8c2ceff4e7b5d79dd82e367a53c695cd75.tar.bz2 | |
Make download_query work if ICU is built without std::string.
download_query.cc relies on being able to pass a std::string to
icu::UnicodeString::fromUTF8, which doesn't work if use_system_icu is
enabled and the system ICU doesn't have std::string support (e.g.
Android). Avoid the need for this by passing it as a C string.
Review URL: https://chromiumcodereview.appspot.com/10356073
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136281 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/download/download_query.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/download/download_query.cc b/chrome/browser/download/download_query.cc index 4717a17..c2049d21 100644 --- a/chrome/browser/download/download_query.cc +++ b/chrome/browser/download/download_query.cc @@ -147,7 +147,7 @@ DownloadQuery::FilterCallback BuildRegexFilter( UParseError re_err; UErrorCode re_status = U_ZERO_ERROR; scoped_ptr<icu::RegexPattern> pattern(icu::RegexPattern::compile( - icu::UnicodeString::fromUTF8(regex_str), re_err, re_status)); + icu::UnicodeString::fromUTF8(regex_str.c_str()), re_err, re_status)); if (!U_SUCCESS(re_status)) return DownloadQuery::FilterCallback(); return base::Bind(&FindRegex, base::Owned(pattern.release()), base::Bind(accessor)); |