Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / app_list / search / tokenized_string.cc

diff --git a/src/chrome/browser/ui/app_list/search/tokenized_string.cc b/src/chrome/browser/ui/app_list/search/tokenized_string.cc
index 6769e2d..fc857fb 100644 (file)
--- a/src/chrome/browser/ui/app_list/search/tokenized_string.cc
+++ b/src/chrome/browser/ui/app_list/search/tokenized_string.cc
@@ -13,7 +13,7 @@ using base::i18n::BreakIterator;
 
 namespace app_list {
 
-TokenizedString::TokenizedString(const string16& text)
+TokenizedString::TokenizedString(const base::string16& text)
     : text_(text) {
   Tokenize();
 }
@@ -22,13 +22,17 @@ TokenizedString::~TokenizedString() {}
 
 void TokenizedString::Tokenize() {
   BreakIterator break_iter(text_,  BreakIterator::BREAK_WORD);
-  CHECK(break_iter.Init());
+  if (!break_iter.Init()) {
+    NOTREACHED() << "BreakIterator init failed"
+                 << ", text=\"" << text_ << "\"";
+    return;
+  }
 
   while (break_iter.Advance()) {
     if (!break_iter.IsWord())
       continue;
 
-    const string16 word(break_iter.GetString());
+    const base::string16 word(break_iter.GetString());
     const size_t word_start = break_iter.prev();
     TermBreakIterator term_iter(word);
     while (term_iter.Advance()) {