diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js index 1e37734c740..8a4d5678532 100644 --- a/b2g/app/b2g.js +++ b/b2g/app/b2g.js @@ -333,7 +333,7 @@ pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar"); // If an urlclassifier table has not been updated in this number of seconds, // a gethash request will be forced to check that the result is still in // the database. -pref("urlclassifier.confirm-age", 2700); +pref("urlclassifier.max-complete-age", 2700); // URL for checking the reason for a malware warning. pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site="); diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index c878dd72665..57f2ab2a8d9 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -741,7 +741,7 @@ pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar"); // If an urlclassifier table has not been updated in this number of seconds, // a gethash request will be forced to check that the result is still in // the database. -pref("urlclassifier.confirm-age", 2700); +pref("urlclassifier.max-complete-age", 2700); #endif pref("browser.geolocation.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/geolocation/"); diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index 72c01d1f364..65395735702 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -584,7 +584,7 @@ pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar"); // If an urlclassifier table has not been updated in this number of seconds, // a gethash request will be forced to check that the result is still in // the database. -pref("urlclassifier.confirm-age", 2700); +pref("urlclassifier.max-complete-age", 2700); #endif // True if this is the first time we are showing about:firstrun diff --git a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js index 09471174419..81e3639da09 100644 --- a/mobile/xul/app/mobile.js +++ b/mobile/xul/app/mobile.js @@ -625,7 +625,7 @@ pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar"); // If an urlclassifier table has not been updated in this number of seconds, // a gethash request will be forced to check that the result is still in // the database. -pref("urlclassifier.confirm-age", 2700); +pref("urlclassifier.max-complete-age", 2700); // URL for checking the reason for a malware warning. pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site="); diff --git a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp index 13c0df9963a..78d1da38f65 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp @@ -70,7 +70,7 @@ PRLogModuleInfo *gUrlClassifierDbServiceLog = nullptr; #define GETHASH_TABLES_PREF "urlclassifier.gethashtables" -#define CONFIRM_AGE_PREF "urlclassifier.confirm-age" +#define CONFIRM_AGE_PREF "urlclassifier.max-complete-age" #define CONFIRM_AGE_DEFAULT_SEC (45 * 60) class nsUrlClassifierDBServiceWorker; diff --git a/toolkit/components/url-classifier/tests/unit/test_partial.js b/toolkit/components/url-classifier/tests/unit/test_partial.js index 69ba49af298..fc3600409c6 100644 --- a/toolkit/components/url-classifier/tests/unit/test_partial.js +++ b/toolkit/components/url-classifier/tests/unit/test_partial.js @@ -743,7 +743,7 @@ function testStaleList() }; // Consider a match stale after one second. - prefBranch.setIntPref("urlclassifier.confirm-age", 1); + prefBranch.setIntPref("urlclassifier.max-complete-age", 1); // Apply the update. doStreamUpdate(update, function() { @@ -752,7 +752,7 @@ function testStaleList() new Timer(3000, function() { // Now the lists should be marked stale. Check assertions. checkAssertions(assertions, function() { - prefBranch.setIntPref("urlclassifier.confirm-age", 2700); + prefBranch.setIntPref("urlclassifier.max-complete-age", 2700); runNextTest(); }); }, updateError); @@ -783,7 +783,7 @@ function testStaleListEmpty() }; // Consider a match stale after one second. - prefBranch.setIntPref("urlclassifier.confirm-age", 1); + prefBranch.setIntPref("urlclassifier.max-complete-age", 1); // Apply the update. doStreamUpdate(update, function() { @@ -792,7 +792,7 @@ function testStaleListEmpty() new Timer(3000, function() { // Now the lists should be marked stale. Check assertions. checkAssertions(assertions, function() { - prefBranch.setIntPref("urlclassifier.confirm-age", 2700); + prefBranch.setIntPref("urlclassifier.max-complete-age", 2700); runNextTest(); }); }, updateError);