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

Unified Diff: base/i18n/time_formatting_unittest.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
« no previous file with comments | « base/i18n/time_formatting.cc ('k') | base/i18n/timezone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/i18n/time_formatting_unittest.cc
diff --git a/base/i18n/time_formatting_unittest.cc b/base/i18n/time_formatting_unittest.cc
index aa6fe6edad39a6f47fea89b107e210f8832e3393..98b6a209aa138d4bdeaf86facf3ef5be738b740b 100644
--- a/base/i18n/time_formatting_unittest.cc
+++ b/base/i18n/time_formatting_unittest.cc
@@ -7,6 +7,7 @@
#include <memory>
#include "base/i18n/rtl.h"
+#include "base/i18n/unicodestring.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/icu_test_util.h"
#include "base/time/time.h"
@@ -37,7 +38,7 @@ string16 GetShortTimeZone(const Time& time) {
zone_formatter->format(UTZFMT_STYLE_SPECIFIC_SHORT, *zone,
static_cast<UDate>(time.ToDoubleT() * 1000),
name, nullptr);
- return string16(name.getBuffer(), name.length());
+ return i18n::UnicodeStringToString16(name);
}
// Calls TimeDurationFormat() with |delta| and |width| and returns the resulting
« no previous file with comments | « base/i18n/time_formatting.cc ('k') | base/i18n/timezone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698