Merge mozilla-central to inbound. a=merge CLOSED TREE

testing/marionette/client/marionette_driver/geckoinstance.py

@@ -59,9 +59,6 @@ class GeckoInstance(object):
         "dom.max_chrome_script_run_time": 0,
         "dom.max_script_run_time": 0,
 
-        # DOM Push
-        "dom.push.connection.enabled": False,
-
         # Only load extensions from the application and user profile
         # AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION
         "extensions.autoDisableScopes": 0,
@@ -119,9 +116,6 @@ class GeckoInstance(object):
         # Make sure SNTP requests don't hit the network
         "network.sntp.pools": "%(server)s",
 
-        # Privacy and Tracking Protection
-        "privacy.trackingprotection.enabled": False,
-
         # Don't do network connections for mitm priming
         "security.certerrors.mitm.priming.enabled": False,
 

testing/marionette/prefs/marionette.js

@@ -36,9 +36,3 @@ pref("marionette.prefs.recommended", true);
 // Deprecated and scheduled for removal
 // with https://bugzil.la/marionette-window-tracking
 pref("marionette.contentListener", false);
-
-// Turn off DOM Push
-pref("dom.push.connection.enabled", false);
-
-// Privacy and tracking protection
-pref("privacy.trackingprotection.enabled", false);