From 7e6ad8beb50dd9c2d3cd71c798890f00c49110a1 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Mon, 24 Mar 2014 18:07:13 -0700
Subject: [PATCH] Backed out changeset 3d94ebde9018 (bug 985720) for missing a
 file from the patch to fix a CLOSED TREE

---
 browser/app/profile/firefox.js                                | 4 ++--
 toolkit/components/downloads/ApplicationReputation.cpp        | 4 ++--
 toolkit/components/downloads/test/unit/test_app_rep.js        | 4 ++--
 toolkit/components/url-classifier/SafeBrowsing.jsm            | 4 ++--
 .../components/url-classifier/nsUrlClassifierDBService.cpp    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 07f122da9cf4..3c3ba6244b46 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -828,12 +828,12 @@ pref("urlclassifier.gethashnoise", 4);
 // the database.
 pref("urlclassifier.max-complete-age", 2700);
 // Tables for application reputation.
-pref("urlclassifier.downloadBlockTable", "goog-badbinurl-shavar");
+pref("urlclassifier.download_block_table", "goog-badbinurl-shavar");
 #ifdef XP_WIN
 // Only download the whitelist on Windows, since the whitelist is
 // only useful for suppressing remote lookups for signed binaries which we can
 // only verify on Windows (Bug 974579).
-pref("urlclassifier.downloadAllowTable", "goog-downloadwhite-digest256");
+pref("urlclassifier.download_allow_table", "goog-downloadwhite-digest256");
 #endif
 #endif
 
diff --git a/toolkit/components/downloads/ApplicationReputation.cpp b/toolkit/components/downloads/ApplicationReputation.cpp
index 7e248ac047c1..a1918936414c 100644
--- a/toolkit/components/downloads/ApplicationReputation.cpp
+++ b/toolkit/components/downloads/ApplicationReputation.cpp
@@ -55,8 +55,8 @@ using safe_browsing::ClientDownloadRequest_CertificateChain;
 #define PREF_SB_APP_REP_URL "browser.safebrowsing.appRepURL"
 #define PREF_SB_MALWARE_ENABLED "browser.safebrowsing.malware.enabled"
 #define PREF_GENERAL_LOCALE "general.useragent.locale"
-#define PREF_DOWNLOAD_BLOCK_TABLE "urlclassifier.downloadBlockTable"
-#define PREF_DOWNLOAD_ALLOW_TABLE "urlclassifier.downloadAllowTable"
+#define PREF_DOWNLOAD_BLOCK_TABLE "urlclassifier.download_block_table"
+#define PREF_DOWNLOAD_ALLOW_TABLE "urlclassifier.download_allow_table"
 
 // NSPR_LOG_MODULES=ApplicationReputation:5
 #if defined(PR_LOGGING)
diff --git a/toolkit/components/downloads/test/unit/test_app_rep.js b/toolkit/components/downloads/test/unit/test_app_rep.js
index 0a9f426d11c8..76d47b234b53 100644
--- a/toolkit/components/downloads/test/unit/test_app_rep.js
+++ b/toolkit/components/downloads/test/unit/test_app_rep.js
@@ -61,10 +61,10 @@ function run_test() {
   });
 
   // Set download_block_table explicitly.
-  Services.prefs.setCharPref("urlclassifier.downloadBlockTable",
+  Services.prefs.setCharPref("urlclassifier.download_block_table",
                              "goog-badbinurl-shavar");
   do_register_cleanup(function() {
-    Services.prefs.clearUserPref("urlclassifier.downloadBlockTable");
+    Services.prefs.clearUserPref("urlclassifier.download_block_table");
   });
 
   gHttpServ = new HttpServer();
diff --git a/toolkit/components/url-classifier/SafeBrowsing.jsm b/toolkit/components/url-classifier/SafeBrowsing.jsm
index aacf76c6d0aa..b6ad1c185112 100644
--- a/toolkit/components/url-classifier/SafeBrowsing.jsm
+++ b/toolkit/components/url-classifier/SafeBrowsing.jsm
@@ -13,9 +13,9 @@ Cu.import("resource://gre/modules/Services.jsm");
 const phishingList = Services.prefs.getCharPref("urlclassifier.phish_table");
 const malwareList = Services.prefs.getCharPref("urlclassifier.malware_table");
 const downloadBlockList =
-  Services.prefs.getCharPref("urlclassifier.downloadBlockTable");
+  Services.prefs.getCharPref("urlclassifier.download_block_table");
 const downloadAllowList =
-  Services.prefs.getCharPref("urlclassifier.downloadAllowTable");
+  Services.prefs.getCharPref("urlclassifier.download_allow_table");
 
 var debug = false;
 function log(...stuff) {
diff --git a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
index 632c4411425d..cf31a187bb18 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
@@ -71,8 +71,8 @@ PRLogModuleInfo *gUrlClassifierDbServiceLog = nullptr;
 
 #define MALWARE_TABLE_PREF      "urlclassifier.malware_table"
 #define PHISH_TABLE_PREF        "urlclassifier.phish_table"
-#define DOWNLOAD_BLOCK_TABLE_PREF "urlclassifier.downloadBlockTable"
-#define DOWNLOAD_ALLOW_TABLE_PREF "urlclassifier.downloadAllowTable"
+#define DOWNLOAD_BLOCK_TABLE_PREF "urlclassifier.download_block_table"
+#define DOWNLOAD_ALLOW_TABLE_PREF "urlclassifier.download_allow_table"
 #define DISALLOW_COMPLETION_TABLE_PREF "urlclassifier.disallow_completions"
 
 #define CONFIRM_AGE_PREF        "urlclassifier.max-complete-age"