Merge branch 'whitelist-fingerprinting' of https://github.com/EFForg/…

…privacybadger into whitelist-fingerprinting

src/js/background.js

@@ -50,6 +50,7 @@ function Badger() {
     self.heuristicBlocking = new HeuristicBlocking.HeuristicBlocker(thisStorage);
     self.updateTabList();
     self.initializeDefaultSettings();
+    self.registerContentScripts();
     try {
       self.runMigrations();
     } finally {
@@ -694,6 +695,7 @@ Badger.prototype = {
     if (disabledSites.indexOf(origin) < 0) {
       disabledSites.push(origin);
       settings.setItem("disabledSites", disabledSites);
+      this.registerContentScripts();
     }
   },
 
@@ -768,7 +770,6 @@ Badger.prototype = {
     }
 
     const registerActive = browser.contentScripts.register(activeScripts);
-    // TODO socialwidgets.js should only be loaded if widget replacement is enabled.
     const registerIdle = browser.contentScripts.register(idleScripts);
 
     registerActive.then((res) => {badger.activeContentScripts = res;});

src/js/contentscripts/fingerprinting.js

@@ -320,27 +320,20 @@ function insertFpScript(text, data) {
   parent.removeChild(script);
 }
 
-// TODO race condition; fix waiting on https://crbug.com/478183
-chrome.runtime.sendMessage({checkEnabled: true},
-  function (enabled) {
-    if (!enabled) {
-      return;
-    }
-    /**
-     * Communicating to webrequest.js
-     */
-    var event_id = Math.random();
-
-    // listen for messages from the script we are about to insert
-    document.addEventListener(event_id, function (e) {
-      // pass these on to the background page
-      chrome.runtime.sendMessage({
-        'fpReport': e.detail
-      });
-    });
+/**
+ * Communicating to webrequest.js
+ */
+var event_id = Math.random();
+
+// listen for messages from the script we are about to insert
+document.addEventListener(event_id, function (e) {
+  // pass these on to the background page
+  chrome.runtime.sendMessage({
+    'fpReport': e.detail
+  });
+});
+
+insertFpScript(getFpPageScript(), {
+  event_id: event_id
+});
 
-    insertFpScript(getFpPageScript(), {
-      event_id: event_id
-    });
-  }
-);

src/js/contentscripts/socialwidgets.js

@@ -327,11 +327,4 @@ function unblockTracker(buttonUrls, callback) {
   chrome.runtime.sendMessage(request, callback);
 }
 
-chrome.runtime.sendMessage({
-  checkSocialWidgetReplacementEnabled: true
-}, function (checkSocialWidgetReplacementEnabled) {
-  if (!checkSocialWidgetReplacementEnabled) {
-    return;
-  }
-  initialize();
-});
+initialize();

src/js/options.js

@@ -304,6 +304,7 @@ function updateSocialWidgetReplacement() {
       socialWidgetReplacementEnabled: enabled
     }
   });
+  badger.registerContentScripts();
 }
 
 function updateCheckingDNTPolicy() {

src/js/webrequest.js

@@ -73,12 +73,14 @@ function onBeforeRequest(details) {
       frame_id = 0;
     }
 
+    badger.insertContentScripts(tab_id, url, frame_id, is_internal);
     badger.recordFrame(tab_id, frame_id, details.parentFrameId, url);
 
     return {};
   }
 
   if (type == "sub_frame") {
+    badger.insertContentScripts(tab_id, url, frame_id, is_internal);
     badger.recordFrame(tab_id, frame_id, details.parentFrameId, url);
   }