Update from https://crrev.com/327068

base/i18n/file_util_icu.cc

Index: base/i18n/file_util_icu.cc
diff --git a/base/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc
index f57bb396a9162c0a9b4b3e5ae124d3add51afa7e..f6e2c2956f4f189073e75a5c29125bf70c218c05 100644
--- a/base/i18n/file_util_icu.cc
+++ b/base/i18n/file_util_icu.cc
@@ -152,16 +152,15 @@ bool LocaleAwareCompareFilenames(const FilePath& a, const FilePath& b) {
   collator->setStrength(icu::Collator::TERTIARY);
 
 #if defined(OS_WIN)
-  return CompareString16WithCollator(collator.get(),
-      WideToUTF16(a.value()), WideToUTF16(b.value())) == UCOL_LESS;
+  return CompareString16WithCollator(*collator, WideToUTF16(a.value()),
+                                     WideToUTF16(b.value())) == UCOL_LESS;
 
 #elif defined(OS_POSIX)
   // On linux, the file system encoding is not defined. We assume
   // SysNativeMBToWide takes care of it.
   return CompareString16WithCollator(
-      collator.get(),
-      WideToUTF16(SysNativeMBToWide(a.value().c_str())),
-      WideToUTF16(SysNativeMBToWide(b.value().c_str()))) == UCOL_LESS;
+             *collator, WideToUTF16(SysNativeMBToWide(a.value().c_str())),
+             WideToUTF16(SysNativeMBToWide(b.value().c_str()))) == UCOL_LESS;
 #else
   #error Not implemented on your system
 #endif