Bug 823665 - Rename urlclassifier.confirm-age to max-complete-age. r=gcp

This commit is contained in:
Gian-Carlo Pascutto 2012-12-21 08:48:30 +01:00
parent e8127e40e7
commit b261864022
6 changed files with 9 additions and 9 deletions

View File

@ -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=");

View File

@ -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/");

View File

@ -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

View File

@ -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=");

View File

@ -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;

View File

@ -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);