Prepare Chromium and Blink for ICU 59

components/bookmarks/browser/titled_url_index.cc

 // Copyright 2014 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 "components/bookmarks/browser/titled_url_index.h"
 
 #include <stdint.h>
 
 #include "base/i18n/case_conversion.h"
+#include "base/i18n/unicodestring.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_offset_string_conversions.h"
 #include "build/build_config.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/browser/titled_url_match.h"
 #include "components/bookmarks/browser/titled_url_node.h"
 #include "components/bookmarks/browser/titled_url_node_sorter.h"
 #include "components/query_parser/snippet.h"
 #include "third_party/icu/source/common/unicode/normalizer2.h"
@@ skipping 15 matching lines @@
   }
   icu::UnicodeString unicode_text(
       text.data(), static_cast<int32_t>(text.length()));
   icu::UnicodeString unicode_normalized_text;
   normalizer2->normalize(unicode_text, unicode_normalized_text, status);
   if (U_FAILURE(status)) {
     // This should not happen. Log the error and fall back.
     LOG(ERROR) << "normalization failed: " << u_errorName(status);
     return text;
   }
-  return base::string16(unicode_normalized_text.getBuffer(),
-                        unicode_normalized_text.length());
+  return base::i18n::UnicodeStringToString16(unicode_normalized_text);
 }
 
 }  // namespace
 
 TitledUrlIndex::TitledUrlIndex(std::unique_ptr<TitledUrlNodeSorter> sorter)
     : sorter_(std::move(sorter)) {
 }
 
 TitledUrlIndex::~TitledUrlIndex() {
 }
@@ skipping 194 matching lines @@
     // We can get here if the node has the same term more than once. For
     // example, a node with the title 'foo foo' would end up here.
     return;
   }
   i->second.erase(node);
   if (i->second.empty())
     index_.erase(i);
 }
 
 }  // namespace bookmarks