Prepare Chromium and Blink for ICU 59

chromeos/settings/timezone_settings.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 "chromeos/settings/timezone_settings.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/i18n/unicodestring.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/task_runner.h"
@@ skipping 451 matching lines @@
   if (base::SysInfo::IsRunningOnChromeOS()) {
     return TimezoneSettingsImpl::GetInstance();
   } else {
     return TimezoneSettingsStubImpl::GetInstance();
   }
 }
 
 // static
 base::string16 TimezoneSettings::GetTimezoneID(const icu::TimeZone& timezone) {
   icu::UnicodeString id;
-  timezone.getID(id);
-  return base::string16(id.getBuffer(), id.length());
+  return base::i18n::UnicodeStringToString16(timezone.getID(id));

[Daniel Erat, 2017/03/14 19:58:06]

wow, this ICU method feels weird! i had to look it up, but it both updates |id|
(which is passed by reference) and returns a reference to it.

 }
 
 }  // namespace system
 }  // namespace chromeos