[Autofill] Guard against the initialization failure of ICU Collator.

components/autofill/core/common/autofill_l10n_util.cc

Index: components/autofill/core/common/autofill_l10n_util.cc
diff --git a/components/autofill/core/common/autofill_l10n_util.cc b/components/autofill/core/common/autofill_l10n_util.cc
index 6f063a85f4f7821d0e962b3d26680b26d075d151..36e4b86c27cf12df92f83e1dfc26dc3115bae8aa 100644
--- a/components/autofill/core/common/autofill_l10n_util.cc
+++ b/components/autofill/core/common/autofill_l10n_util.cc
@@ -6,15 +6,32 @@
 
 #include "base/i18n/string_compare.h"
 #include "base/logging.h"
+#include "base/metrics/histogram_macros.h"
 
 namespace autofill {
 namespace l10n {
 
-CaseInsensitiveCompare::CaseInsensitiveCompare() {
+CaseInsensitiveCompare::CaseInsensitiveCompare()
+    : CaseInsensitiveCompare(icu::Locale::getDefault()) {}
+
+CaseInsensitiveCompare::CaseInsensitiveCompare(const icu::Locale& locale) {
   UErrorCode error = U_ZERO_ERROR;
-  collator_.reset(icu::Collator::createInstance(error));
-  DCHECK(U_SUCCESS(error));
-  collator_->setStrength(icu::Collator::PRIMARY);
+  collator_.reset(icu::Collator::createInstance(locale, error));
+  // 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.
+  bool success = U_SUCCESS(error) ? true : false;

[Mathieu, 2015/11/20 18:40:46]

This is not elegant, but I had to do it to fix a compile error (it wouldn't
assign a bool from the return value of U_SUCCESS). Example here:
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...

[Evan Stade, 2015/11/20 19:49:47]

normally I use !! for this, or you can probably do U_SUCCESS(error) == TRUE or
static_cast to bool

[Mathieu, 2015/11/20 21:16:42]

Done.

+  if (success) {
+    collator_->setStrength(icu::Collator::PRIMARY);
+  } else {
+    // NOTE(mathp): Developers hitting this should either report their device
+    // information in the bug linked above, or contact me directly.
+    LOG(ERROR) << "Failed to initialize the ICU Collator for "
+               << "CaseInsensitiveCompare.";
+  }
+
+  UMA_HISTOGRAM_BOOLEAN("Autofill.IcuCollatorCreationSuccess", success);
 }
 
 CaseInsensitiveCompare::~CaseInsensitiveCompare() {
@@ -22,8 +39,11 @@ CaseInsensitiveCompare::~CaseInsensitiveCompare() {
 
 bool CaseInsensitiveCompare::StringsEqual(const base::string16& lhs,
                                           const base::string16& rhs) const {
-  return base::i18n::CompareString16WithCollator(*collator_, lhs, rhs) ==
-         UCOL_EQUAL;
+  if (collator_.get()) {
+    return base::i18n::CompareString16WithCollator(*collator_, lhs, rhs) ==
+           UCOL_EQUAL;
+  }
+  return lhs == rhs;
 }
 
 }  // namespace l10n