"domain" item added to HistoryEntry to allow showing IDN in chrome://history/

chrome/browser/history/url_database.cc

 // Copyright (c) 2012 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/history/url_database.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
 
 #include "base/i18n/case_conversion.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/url_constants.h"
+#include "net/base/net_util.h"
 #include "sql/statement.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace history {
 
 const char URLDatabase::kURLRowFields[] = HISTORY_URL_ROW_FIELDS;
 const int URLDatabase::kNumURLRowFields = 9;
 
 URLDatabase::URLEnumeratorBase::URLEnumeratorBase()
@@ skipping 339 matching lines @@
   query_parser_.ParseQueryNodes(query, &query_nodes.get());
 
   results->clear();
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT" HISTORY_URL_ROW_FIELDS "FROM urls WHERE hidden = 0"));
 
   while (statement.Step()) {
     std::vector<QueryWord> query_words;
     string16 url = base::i18n::ToLower(statement.ColumnString16(1));
     query_parser_.ExtractQueryWords(url, &query_words);
+    GURL gurl(url);
+    if (gurl.is_valid()) {
+      // Decode punycode to match IDN.
+      // |query_words| won't be shown to user - therefore we can use empty
+      // |languages| to reduce dependency (no need to call PrefService).
+      string16 ascii = base::ASCIIToUTF16(gurl.host());
+      string16 utf = net::IDNToUnicode(gurl.host(), std::string());
+      if (ascii != utf)
+        query_parser_.ExtractQueryWords(utf, &query_words);
+    }
     string16 title = base::i18n::ToLower(statement.ColumnString16(2));
     query_parser_.ExtractQueryWords(title, &query_words);
 
     if (query_parser_.DoesQueryMatch(query_words, query_nodes.get())) {
       history::URLResult info;
       FillURLRow(statement, &info);
       if (info.url().is_valid())
         results->push_back(info);
     }
   }
@@ skipping 211 matching lines @@
   return GetDB().Execute(sql.c_str());
 }
 
 bool URLDatabase::CreateMainURLIndex() {
   // Index over URLs so we can quickly look up based on URL.
   return GetDB().Execute(
       "CREATE INDEX IF NOT EXISTS urls_url_index ON urls (url)");
 }
 
 }  // namespace history