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

chrome/test/data/webui/history_browsertest.js

 // 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.
 
 GEN('#include "chrome/test/data/webui/history_ui_browsertest.h"');
 
 /** @const */ var TOTAL_RESULT_COUNT = 160;
 /** @const */ var WAIT_TIMEOUT = 200;
 
 /**
  * Test fixture for history WebUI testing.
  * @constructor
  * @extends {testing.Test}
  */
 function HistoryUIBrowserTest() {}
 
 /**
  * Create a fake history result with the given timestamp.
  * @param {Number} timestamp Timestamp of the entry, in ms since the epoch.
  * @param {String} url The URL to set on this entry.
  * @return {Object} An object representing a history entry.
  */
 function createHistoryEntry(timestamp, url) {
   var d = new Date(timestamp);
+  // Extract domain from url.
+  var domainMatch = url.replace(/^.+?:\/\//, '').match(/[^/]+/);
+  var domain = domainMatch ? domainMatch[0] : '';
   return {
     dateTimeOfDay: d.getHours() + ':' + d.getMinutes(),
     dateRelativeDay: d.toDateString(),
     allTimestamps: [timestamp],
     starred: false,
     time: timestamp,
     title: d.toString(),  // Use the stringified date as the title.
-    url: url
+    url: url,
+    domain: domain
   };
 }
 
 /**
  * Wait for the history backend to call the global function named
  * |callbackName|, and then execute |afterFunction|. This allows tests to
  * wait on asynchronous backend operations before proceeding.
  */
 function waitForCallback(callbackName, afterFunction) {
   var originalCallback = window[callbackName];
@@ skipping 778 matching lines @@
   var removeVisit = $('remove-visit');
   expectTrue(removeVisit.disabled);
 
   // Attempting to remove items anyway should fail.
   historyModel.removeVisitsFromHistory(historyModel.visits_, function () {
     // The callback is only called on success.
     testDone([false, 'Delete succeeded even though it was prohibited.']);
   });
   waitForCallback('deleteFailed', testDone);
 });
+
+/**
+ * Fixture for History WebUI testing IDN.
+ * @extends {BaseHistoryWebUITest}
+ * @constructor
+ */
+function HistoryWebUIIDNTest() {}
+
+HistoryWebUIIDNTest.prototype = {
+  __proto__: BaseHistoryWebUITest.prototype,
+
+  /** @override */
+  testGenPreamble: function() {
+    // Add some visits to the history database.
+    GEN('  AddPageToHistory(0, "http://xn--d1abbgf6aiiy.xn--p1ai/",' +
+        ' "Some");');
+
+    // Clear AcceptLanguages to get domain in unicode.
+    GEN('  ClearAcceptLanguages();');
+  },
+};
+
+/**
+ * Simple test that verifies that the correct entries are retrieved from the
+ * history database and displayed in the UI.
+ */
+TEST_F('HistoryWebUIIDNTest', 'basic', function() {
+  // Check that there is only one entry and domain is in unicode.
+  assertEquals(1, document.querySelectorAll('.domain').length);
+  assertEquals("\u043f\u0440\u0435\u0437\u0438\u0434\u0435\u043d\u0442." +
+               "\u0440\u0444", document.querySelector('.domain').textContent);
+
+  testDone();
+});