Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(440)

Unified Diff: base/i18n/string_compare.cc

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/i18n/string_compare.cc
diff --git a/base/i18n/string_compare.cc b/base/i18n/string_compare.cc
index 1ac7284359ca7a849ff3d721bb667fa1a4f4b2b2..2851e7d2dce1e4a724af636ec448a2ac1d8eacd2 100644
--- a/base/i18n/string_compare.cc
+++ b/base/i18n/string_compare.cc
@@ -12,12 +12,11 @@ namespace i18n {
// Compares the character data stored in two different string16 strings by
// specified Collator instance.
-UCollationResult CompareString16WithCollator(const icu::Collator* collator,
+UCollationResult CompareString16WithCollator(const icu::Collator& collator,
const string16& lhs,
const string16& rhs) {
- DCHECK(collator);
UErrorCode error = U_ZERO_ERROR;
- UCollationResult result = collator->compare(
+ UCollationResult result = collator.compare(
static_cast<const UChar*>(lhs.c_str()), static_cast<int>(lhs.length()),
static_cast<const UChar*>(rhs.c_str()), static_cast<int>(rhs.length()),
error);
« no previous file with comments | « base/i18n/string_compare.h ('k') | base/json/json_parser.cc » ('j') | mojo/public/tools/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698