Prepare Chromium and Blink for ICU 59

net/ftp/ftp_util.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 "net/ftp/ftp_util.h"
 
 #include <map>
 #include <vector>
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/char_iterator.h"
+#include "base/i18n/unicodestring.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 146 matching lines @@
       // If we cannot get format symbols for some locale, it's not a fatal
       // error. Just try another one.
       if (U_FAILURE(status))
         continue;
 
       int32_t months_count;
       const icu::UnicodeString* months =
           format_symbols.getShortMonths(months_count);
 
       for (int32_t month = 0; month < months_count; month++) {
-        base::string16 month_name(months[month].getBuffer(),
-                            static_cast<size_t>(months[month].length()));
+        base::string16 month_name(
+            base::i18n::UnicodeStringToString16(months[month]));
 
         // Ignore the case of the month names. The simplest way to handle that
         // is to make everything lowercase.
         month_name = base::i18n::ToLower(month_name);
 
         map_[month_name] = month + 1;
 
         // Sometimes ICU returns longer strings, but in FTP listings a shorter
         // abbreviation is used (for example for the Russian locale). Make sure
         // we always have a map entry for a three-letter abbreviation.
@@ skipping 175 matching lines @@
     while (!iter.end() && !u_isspace(iter.get()))
       iter.Advance();
   }
 
   base::string16 result(text.substr(iter.array_pos()));
   base::TrimWhitespace(result, base::TRIM_ALL, &result);
   return result;
 }
 
 }  // namespace net