From 0d21e3454c40846d3d5dfaf101d9016ec818e443 Mon Sep 17 00:00:00 2001
From: Eugen Sawin <esawin@mozilla.com>
Date: Mon, 12 Feb 2018 19:31:53 +0100
Subject: [PATCH] Bug 1436887 - [1.1] Add GeckoView prefs file. r=snorp,jchen

---
 .eslintignore                                | 1 +
 mobile/android/app/geckoview-prefs.js        | 9 +++++++++
 mobile/android/app/moz.build                 | 1 +
 mobile/android/installer/package-manifest.in | 4 ++++
 4 files changed, 15 insertions(+)
 create mode 100644 mobile/android/app/geckoview-prefs.js

diff --git a/.eslintignore b/.eslintignore
index d2ed1c499264..5eb425666e5f 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -324,6 +324,7 @@ mobile/android/tests/browser/chrome/tp5/**
 
 # Uses `#filter substitution`
 mobile/android/app/mobile.js
+mobile/android/app/geckoview-prefs.js
 
 # Uses `#expand`
 mobile/android/chrome/content/about.js
diff --git a/mobile/android/app/geckoview-prefs.js b/mobile/android/app/geckoview-prefs.js
new file mode 100644
index 000000000000..cee65d9de388
--- /dev/null
+++ b/mobile/android/app/geckoview-prefs.js
@@ -0,0 +1,9 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#filter substitution
+
+#include mobile.js
+
+pref("privacy.trackingprotection.pbmode.enabled", false);
diff --git a/mobile/android/app/moz.build b/mobile/android/app/moz.build
index ba09d637519c..8ff152f3b369 100644
--- a/mobile/android/app/moz.build
+++ b/mobile/android/app/moz.build
@@ -49,6 +49,7 @@ if CONFIG['MOZ_PKG_SPECIAL']:
     DEFINES['MOZ_PKG_SPECIAL'] = CONFIG['MOZ_PKG_SPECIAL']
 
 JS_PREFERENCE_PP_FILES += [
+     'geckoview-prefs.js',
      'mobile.js',
 ]
 
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index 265519775324..896315ee94da 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -435,7 +435,11 @@
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
+#ifdef MOZ_GECKOVIEW_JAR
+@BINPATH@/@PREF_DIR@/geckoview-prefs.js
+#else
 @BINPATH@/@PREF_DIR@/mobile.js
+#endif
 @BINPATH@/@PREF_DIR@/channel-prefs.js
 @BINPATH@/ua-update.json
 @BINPATH@/greprefs.js