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

Unified Diff: components/bookmarks/browser/titled_url_index.cc

Issue 2740673002: Prepare Chromium and Blink for ICU 59 (Closed)
Patch Set: revert accidental revert of sftnly roll during rebase Created 3 years, 9 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: components/bookmarks/browser/titled_url_index.cc
diff --git a/components/bookmarks/browser/titled_url_index.cc b/components/bookmarks/browser/titled_url_index.cc
index abde1aa9e54868c104fab064d1659392c9b48585..fa9ed7647ebf04c0051a9a18384d8ab559553aa6 100644
--- a/components/bookmarks/browser/titled_url_index.cc
+++ b/components/bookmarks/browser/titled_url_index.cc
@@ -7,6 +7,7 @@
#include <stdint.h>
#include "base/i18n/case_conversion.h"
+#include "base/i18n/unicodestring.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/utf_offset_string_conversions.h"
@@ -42,8 +43,7 @@ base::string16 Normalize(const base::string16& text) {
LOG(ERROR) << "normalization failed: " << u_errorName(status);
return text;
}
- return base::string16(unicode_normalized_text.getBuffer(),
- unicode_normalized_text.length());
+ return base::i18n::UnicodeStringToString16(unicode_normalized_text);
}
} // namespace
« no previous file with comments | « components/autofill/core/browser/credit_card.cc ('k') | content/browser/android/date_time_chooser_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698