Issue 3823 - Split up message responder code

include.preload.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 157 matching lines @@
     );
   }
 
   window.collapsing = true;
 }
 
 function checkSitekey()
 {
   var attr = document.documentElement.getAttribute("data-adblockkey");
   if (attr)
-    ext.backgroundPage.sendMessage({type: "add-sitekey", token: attr});
+    ext.backgroundPage.sendMessage({type: "filter.addKey", token: attr});
 }
 
 function getContentDocument(element)
 {
   try
   {
     return element.contentDocument;
   }
   catch (e)
   {
@@ skipping 45 matching lines @@
           }
         }
 
         if (matched)
           break;
       }
     }
 
     if (matchedSelectors.length > 0)
       ext.backgroundPage.sendMessage({
-        type: "trace-elemhide",
+        type: "devtools.traceElemHide",
         selectors: matchedSelectors
       });
   },
 
   onTimeout: function()
   {
     this.checkNodes(this.changedNodes);
     this.changedNodes = [];
     this.timeout = null;
   },
@@ skipping 282 matching lines @@
   }, true);
 
   return updateStylesheet;
 }
 
 if (document instanceof HTMLDocument)
 {
   checkSitekey();
   window.updateStylesheet = init(document);
 }