Merge develop

src/background.js

@@ -1050,68 +1050,6 @@ function onMessageHandler(request, sender, callback) {
 	return false;
 }
 
-/**
- * Determine Antitracking configuration parameters based
- * on the results returned from the abtest endpoint.
- * @memberOf Background
- *
- * @return {Object} 	Antitracking configuration parameters
- */
-function getAntitrackingTestConfig() {
-	if (abtest.hasTest('antitracking_full')) {
-		return {
-			qsEnabled: true,
-			telemetryMode: 2,
-		};
-	}
-	if (abtest.hasTest('antitracking_half')) {
-		return {
-			qsEnabled: true,
-			telemetryMode: 1,
-		};
-	}
-	if (abtest.hasTest('antitracking_collect')) {
-		return {
-			qsEnabled: false,
-			telemetryMode: 1,
-		};
-	}
-	return {
-		qsEnabled: true,
-		telemetryMode: 1,
-	};
-}
-
-/**
- * Adjust antitracking parameters based on the current state
- * of ABTest and availability of Human Web.
- */
-function setupABTest() {
-	const antitrackingConfig = getAntitrackingTestConfig();
-	if (antitrackingConfig && conf.enable_anti_tracking) {
-		if (!conf.enable_human_web) {
-			// force disable anti-tracking telemetry on humanweb opt-out
-			antitrackingConfig.telemetryMode = 0;
-		}
-		Object.keys(antitrackingConfig).forEach((opt) => {
-			const val = antitrackingConfig[opt];
-			log('antitracking', 'set config option', opt, val);
-			antitracking.action('setConfigOption', opt, val);
-		});
-	}
-	if (abtest.hasTest('antitracking_whitelist2')) {
-		cliqz.prefs.set('attrackBloomFilter', false);
-	}
-	// overlay search AB test
-	// if (abtest.hasTest('overlay_search')) {
-	// 	cliqz.enableModule('search');
-	// 	cliqz.enableModule('overlay');
-	// } else {
-	// 	cliqz.disableModule('search');
-	// 	cliqz.disableModule('overlay');
-	// }
-}
-
 /**
  * Initialize Dispatcher Events.
  * All Conf properties trigger a dispatcher pub event