Use generic icu:: prefix instead of icu_54:: in autofill_l10n_util.cc

components/autofill/core/common/autofill_l10n_util.cc

 // Copyright 2015 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/autofill/core/common/autofill_l10n_util.h"
 
 #include "base/i18n/string_compare.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 
 namespace autofill {
 namespace l10n {
 
 CaseInsensitiveCompare::CaseInsensitiveCompare()
     : CaseInsensitiveCompare(icu::Locale::getDefault()) {}
 
 CaseInsensitiveCompare::CaseInsensitiveCompare(const icu::Locale& locale) {
   UErrorCode error = U_ZERO_ERROR;
   collator_.reset(icu::Collator::createInstance(locale, error));
   if (!collator_) {
     // On some systems, the default locale is invalid to the eyes of the ICU
     // library. This could be due to a device-specific issue (has been seen in
     // the wild on Android devices). In the failure case, |collator_| will be
     // null. See http://crbug.com/558625.
-    icu_54::UnicodeString name;
+    icu::UnicodeString name;
     std::string locale_name;
     locale.getDisplayName(name).toUTF8String(locale_name);
     LOG(ERROR) << "Failed to initialize the ICU Collator for "
                << "CaseInsensitiveCompare with locale" << locale_name;
     // Attempt to load the English locale.
     collator_.reset(icu::Collator::createInstance(icu::Locale::getEnglish(),
                     error));
   }
 
   if (collator_) {
@@ skipping 12 matching lines @@
                                           const base::string16& rhs) const {
   if (collator_) {
     return base::i18n::CompareString16WithCollator(*collator_, lhs, rhs) ==
            UCOL_EQUAL;
   }
   return lhs == rhs;
 }
 
 }  // namespace l10n
 }  // namespace autofill