Case-insensitive search for non-ASCII characters in auto-complete of Drive files.

chrome/browser/chromeos/drive/search_metadata.cc

 // Copyright (c) 2013 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 "chrome/browser/chromeos/drive/search_metadata.h"
 
 #include <algorithm>
 #include <queue>
 
 #include "base/bind.h"
-#include "base/string_util.h"
+#include "base/i18n/string_search.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/escape.h"
 
 using content::BrowserThread;
 
 namespace drive {
 namespace internal {
 
 namespace {
 
-// Used to sort the result canididates per the last accessed/modified time. The
+// Used to sort the result candidates per the last accessed/modified time. The
 // recently accessed/modified files come first.
 bool CompareByTimestamp(const ResourceEntry& a, const ResourceEntry& b) {
   const PlatformFileInfoProto& a_file_info = a.file_info();
   const PlatformFileInfoProto& b_file_info = b.file_info();
 
   if (a_file_info.last_accessed() != b_file_info.last_accessed())
     return a_file_info.last_accessed() > b_file_info.last_accessed();
 
   // When the entries have the same last access time (which happens quite often
   // because Drive server doesn't set the field until an entry is viewed via
@@ skipping 174 matching lines @@
 bool FindAndHighlight(const std::string& text,
                       const std::string& query,
                       std::string* highlighted_text) {
   DCHECK(highlighted_text);
   highlighted_text->clear();
 
   // For empty query, any filename matches with no highlighted text.
   if (query.empty())
     return true;
 
-  // TODO(satorux): Should support non-ASCII characters.
-  std::string lower_text = StringToLowerASCII(text);
-  std::string lower_query = StringToLowerASCII(query);
-
-  int num_matches = 0;
-  std::string::size_type cursor = 0;
-
-  while (cursor < text.size()) {
-    std::string::size_type matched_position =
-        lower_text.find(lower_query, cursor);
-    if (matched_position == std::string::npos)
-      break;
-    ++num_matches;
-
-    std::string skipped_piece =
-        net::EscapeForHTML(text.substr(cursor, matched_position - cursor));
-    std::string matched_piece =
-        net::EscapeForHTML(text.substr(matched_position, query.size()));
-
-    highlighted_text->append(skipped_piece);
-    highlighted_text->append("<b>" + matched_piece + "</b>");
-
-    cursor = matched_position + query.size();
+  string16 text16 = base::UTF8ToUTF16(text);
+  string16 query16 = base::UTF8ToUTF16(query);
+  size_t match_start, match_length;

[satorux1, 2013/05/27 05:00:24]

nit: initialize them with 0 to be extra defensive.

[kinaba, 2013/05/27 05:50:26]

Done.

+  if (!base::i18n::StringSearchIgnoringCaseAndAccents(
+      query16, text16, &match_start, &match_length)) {
+    return false;
   }
-  if (num_matches == 0)
-    return false;
-
-  std::string remaining_piece = text.substr(cursor);
-  highlighted_text->append(net::EscapeForHTML(remaining_piece));
-
+  string16 pre = text16.substr(0, match_start);
+  string16 match = text16.substr(match_start, match_length);
+  string16 post = text16.substr(match_start + match_length);
+  highlighted_text->append(net::EscapeForHTML(UTF16ToUTF8(pre)));
+  highlighted_text->append("<b>");
+  highlighted_text->append(net::EscapeForHTML(UTF16ToUTF8(match)));
+  highlighted_text->append("</b>");
+  highlighted_text->append(net::EscapeForHTML(UTF16ToUTF8(post)));
   return true;
 }
 
 }  // namespace internal
 }  // namespace drive