From ce6640ac3453ddf28cfd5eefd3a8e9e17aba26b0 Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Fri, 20 Apr 2012 07:46:45 +0200
Subject: [PATCH] Backout 1a6d008acb4f (Bug 729928). rs=dcamp a=mfinkle

---
 b2g/app/b2g.js                 | 3 +++
 browser/app/profile/firefox.js | 6 ++++++
 mobile/android/app/mobile.js   | 3 +++
 mobile/xul/app/mobile.js       | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index 68f03abd346e..6725d78892cd 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -380,6 +380,9 @@ pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar");
 // the database.
 pref("urlclassifier.confirm-age", 2700);
 
+// Maximum size of the sqlite3 cache during an update, in bytes
+pref("urlclassifier.updatecachemax", 4194304);
+
 // 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=");
 #endif
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 0b68bb1c1068..c09ddd55c70d 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -775,6 +775,12 @@ pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar");
 // the database.
 pref("urlclassifier.confirm-age", 2700);
 
+// Maximum size of the sqlite3 cache during an update, in bytes
+pref("urlclassifier.updatecachemax", 41943040);
+
+// Maximum size of the sqlite3 cache for lookups, in bytes
+pref("urlclassifier.lookupcachemax", 1048576);
+
 // 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/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 833ec0e487c2..8984d2046244 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -694,6 +694,9 @@ pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar");
 // the database.
 pref("urlclassifier.confirm-age", 2700);
 
+// Maximum size of the sqlite3 cache during an update, in bytes
+pref("urlclassifier.updatecachemax", 4194304);
+
 // 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=");
 #endif
diff --git a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js
index fe261ae8bbc4..436823b547bc 100644
--- a/mobile/xul/app/mobile.js
+++ b/mobile/xul/app/mobile.js
@@ -667,6 +667,9 @@ pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar");
 // the database.
 pref("urlclassifier.confirm-age", 2700);
 
+// Maximum size of the sqlite3 cache during an update, in bytes
+pref("urlclassifier.updatecachemax", 4194304);
+
 // 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=");
 #endif