1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index e205cd4c55..d12adbb558 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4970,9 +4970,7 @@ pref("dom.mapped_arraybuffer.enabled", true);
// The tables used for Safebrowsing phishing and malware checks
pref("urlclassifier.malwareTable", "goog-malware-proto,goog-unwanted-proto,moztest-harmful-simple,moztest-malware-simple,moztest-unwanted-simple");
-#ifdef MOZILLA_OFFICIAL
- // In official builds, we are allowed to use Google's private phishing
- // list (see bug 1288840).
+#ifdef MOZ_OFFICIAL_BRANDING
pref("urlclassifier.phishTable", "goog-phish-proto,moztest-phish-simple");
#else
pref("urlclassifier.phishTable", "googpub-phish-proto,moztest-phish-simple");
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
index d9c9384e97..ef67ae371e 100644
--- a/modules/libpref/moz.build
+++ b/modules/libpref/moz.build
@@ -174,3 +174,6 @@ if CONFIG["MOZ_BACKGROUNDTASKS"]:
FINAL_TARGET_PP_FILES += [
"greprefs.js",
]
+
+if CONFIG['MOZ_OFFICIAL_BRANDING']:
+ DEFINES['MOZ_OFFICIAL_BRANDING'] = True
|
