Backed out changeset ccf75f2fa112 (bug 1275746)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 18 Jan 2017 14:55:43 +0100
changeset 374942 706512864869a1652db3538f82f037e7da782b18
parent 374941 ac80b556e979b8d0ed5d664801c7d5f692be36f0
child 374943 d63f6985b41e8b950e7d905a3e9d7442d5009b5b
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1275746
milestone53.0a1
backs outccf75f2fa112601fad892b26118381b0634ed381
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset ccf75f2fa112 (bug 1275746)
toolkit/components/places/nsNavHistory.cpp
toolkit/components/places/tests/queries/test_sort-date-site-grouping.js
--- a/toolkit/components/places/nsNavHistory.cpp
+++ b/toolkit/components/places/nsNavHistory.cpp
@@ -944,20 +944,16 @@ nsNavHistory::EvaluateQueryForNode(const
 //    We might have interesting encodings and different case in the host name.
 //    This will convert that host name into an ASCII host name by sending it
 //    through the URI canonicalization. The result can be used for comparison
 //    with other ASCII host name strings.
 nsresult // static
 nsNavHistory::AsciiHostNameFromHostString(const nsACString& aHostName,
                                           nsACString& aAscii)
 {
-  aAscii.Truncate();
-  if (aHostName.IsEmpty()) {
-    return NS_OK;
-  }
   // To properly generate a uri we must provide a protocol.
   nsAutoCString fakeURL("http://");
   fakeURL.Append(aHostName);
   nsCOMPtr<nsIURI> uri;
   nsresult rv = NS_NewURI(getter_AddRefs(uri), fakeURL);
   NS_ENSURE_SUCCESS(rv, rv);
   rv = uri->GetAsciiHost(aAscii);
   NS_ENSURE_SUCCESS(rv, rv);
--- a/toolkit/components/places/tests/queries/test_sort-date-site-grouping.js
+++ b/toolkit/components/places/tests/queries/test_sort-date-site-grouping.js
@@ -111,18 +111,17 @@ var testDataAddedLater = [
     levels: [0, 0]
   }
 ];
 
 function run_test() {
   run_next_test();
 }
 
-// Disabled because of bug 1275746
-add_task({ skip_if: () => true }, function* test_sort_date_site_grouping() {
+add_task(function* test_sort_date_site_grouping() {
   yield task_populateDB(testData);
 
   // On Linux, the (local files) folder is shown after sites unlike Mac/Windows.
   // Thus, we avoid running this test on Linux but this should be re-enabled
   // after bug 624024 is resolved.
   let isLinux = ("@mozilla.org/gnome-gconf-service;1" in Components.classes);
   if (isLinux)
     return;