Bug 478097 - Make location bar AutoComplete faster

Slightly modifies our base query for the location bar that makes the query about
20% faster in some basic benchmarking.
r=dietrich

toolkit/components/places/src/nsNavHistoryAutoComplete.cpp

@@ -208,16 +208,13 @@ void GetAutoCompleteBaseQuery(nsACString& aQuery) {
       "WHERE h.frecency <> 0 "
       "{ADDITIONAL_CONDITIONS} "
       "UNION ALL "
-      "SELECT * FROM ( "
-        "SELECT h.url, h.title, f.url") + BOOK_TAG_SQL + NS_LITERAL_CSTRING(", "
-          "h.visit_count, h.typed, h.frecency "
-        "FROM moz_places h "
-        "LEFT OUTER JOIN moz_favicons f ON f.id = h.favicon_id "
-        "WHERE h.id NOT IN (SELECT id FROM moz_places_temp) "
-        "AND h.frecency <> 0 "
-        "{ADDITIONAL_CONDITIONS} "
-        "ORDER BY h.frecency DESC LIMIT (?2 + ?3) "
-      ") "
+      "SELECT h.url, h.title, f.url") + BOOK_TAG_SQL + NS_LITERAL_CSTRING(", "
+        "h.visit_count, h.typed, h.frecency "
+      "FROM moz_places h "
+      "LEFT OUTER JOIN moz_favicons f ON f.id = h.favicon_id "
+      "WHERE h.id NOT IN (SELECT id FROM moz_places_temp) "
+      "AND h.frecency <> 0 "
+      "{ADDITIONAL_CONDITIONS} "
       // ORDER BY h.frecency
       "ORDER BY 9 DESC LIMIT ?2 OFFSET ?3");
 }