Prepare Chromium and Blink for ICU 59

base/i18n/time_formatting_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/i18n/time_formatting.h"
 
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/icu/source/common/unicode/uversion.h"
 #include "third_party/icu/source/i18n/unicode/calendar.h"
 #include "third_party/icu/source/i18n/unicode/timezone.h"
 #include "third_party/icu/source/i18n/unicode/tzfmt.h"
 
 namespace base {
@@ skipping 10 matching lines @@
 string16 GetShortTimeZone(const Time& time) {
   UErrorCode status = U_ZERO_ERROR;
   std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
   std::unique_ptr<icu::TimeZoneFormat> zone_formatter(
       icu::TimeZoneFormat::createInstance(icu::Locale::getDefault(), status));
   EXPECT_TRUE(U_SUCCESS(status));
   icu::UnicodeString name;
   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
 // string. On failure, adds a failed expectation and returns an empty string.
 string16 TimeDurationFormatString(const TimeDelta& delta,
                                   DurationFormatWidth width) {
   string16 str;
   EXPECT_TRUE(TimeDurationFormat(delta, width, &str))
       << "Failed to format " << delta.ToInternalValue() << " with width "
       << width;
@@ skipping 327 matching lines @@
   Time end_time;
   EXPECT_TRUE(Time::FromLocalExploded(kTestIntervalEndTimeExploded, &end_time));
 
   EXPECT_EQ(
       WideToUTF16(L"Saturday, April 30 – Saturday, May 28"),
       DateIntervalFormat(begin_time, end_time, DATE_FORMAT_MONTH_WEEKDAY_DAY));
 }
 
 }  // namespace
 }  // namespace base