Bug 1082294 - Fix for intermittent bug 1082294. r=mak77

This commit is contained in:
Hiroyuki Ikezoe 2014-10-15 00:15:00 +02:00
parent cc42bfe72b
commit 96191c393d
2 changed files with 3 additions and 2 deletions

View File

@ -743,8 +743,8 @@ Search.prototype = {
for (let [query, params] of queries) {
let hasResult = yield conn.executeCached(query, params, this._onResultRow.bind(this));
if (this.pending && params.query_type == QUERYTYPE_AUTOFILL_URL &&
!hasResult) {
if (this.pending && this._enableActions && !hasResult &&
params.query_type == QUERYTYPE_AUTOFILL_URL) {
// If we predicted that our URL autofill query might have gotten a
// result, but it didn't, then we need to recover.
yield this._matchHeuristicFallback();

View File

@ -183,6 +183,7 @@ add_task(function* test_default_behavior_url() {
// RESTRICT TO HISTORY.
Services.prefs.setIntPref("browser.urlbar.default.behavior", 1);
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", true);
Services.prefs.setBoolPref("browser.urlbar.autoFill.searchEngines", false);
do_log_info("URL: Restrict history, common visit, should not autoFill");
yield check_autocomplete({