Prepare Chromium and Blink for ICU 59

chrome/browser/chromeos/system/timezone_util.cc

 // Copyright 2013 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 "chrome/browser/chromeos/system/timezone_util.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/i18n/rtl.h"
+#include "base/i18n/unicodestring.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ skipping 46 matching lines @@
   zone_id.toUTF8String(zone_id_str);
 
   // Resource keys for timezones use ':' in place of '/'.
   base::ReplaceSubstringsAfterOffset(&zone_id_str, 0, "/", ":");
   std::unique_ptr<UResourceBundle, UResClose> zone_item(
       ures_getByKey(zone_strings, zone_id_str.c_str(), NULL, &status));
   icu::UnicodeString city;
   if (!U_FAILURE(status)) {
     city = icu::ures_getUnicodeStringByKey(zone_item.get(), "ec", &status);
     if (U_SUCCESS(status))
-      return base::string16(city.getBuffer(), city.length());
+      return base::i18n::UnicodeStringToString16(city);
   }
 
   // Fallback case in case of failure.
   base::ReplaceSubstringsAfterOffset(&zone_id_str, 0, ":", "/");
   // Take the last component of a timezone id (e.g. 'Baz' in 'Foo/Bar/Baz').
   // Depending on timezones, keeping all but the 1st component
   // (e.g. Bar/Baz) may be better, but our current list does not have
   // any timezone for which that's the case.
   std::string::size_type slash_pos = zone_id_str.rfind('/');
   if (slash_pos != std::string::npos && slash_pos < zone_id_str.size())
@@ skipping 37 matching lines @@
   timezone.getID(id);
   if (id == icu::UnicodeString(chromeos::system::kUTCTimezoneName)) {
     name = icu::UnicodeString(
         l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_TIMEZONE_DISPLAY_NAME_UTC)
             .c_str());
   } else {
     timezone.getDisplayName(dst_offset != 0, icu::TimeZone::LONG, name);
   }
   base::string16 result(l10n_util::GetStringFUTF16(
       IDS_OPTIONS_SETTINGS_TIMEZONE_DISPLAY_TEMPLATE,
-      base::ASCIIToUTF16(offset_str),
-      base::string16(name.getBuffer(), name.length()),
+      base::ASCIIToUTF16(offset_str), base::i18n::UnicodeStringToString16(name),
       GetExemplarCity(timezone)));
   base::i18n::AdjustStringForLocaleDirection(&result);
   return result;
 }
 
 }  // namespace
 
 namespace chromeos {
 namespace system {
 
@@ skipping 45 matching lines @@
     VLOG(1) << "Refresh TimeZone: setting timezone to '" << timezone->timeZoneId
             << "'";
 
     chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
         base::UTF8ToUTF16(timezone->timeZoneId));
   }
 }
 
 }  // namespace system
 }  // namespace chromeos