Issue 4864 - Start using ESLint for adblockpluschrome

lib/whitelisting.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2016 Eyeo GmbH
+ * Copyright (C) 2006-2017 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @module whitelisting */
 
 "use strict";
 
 const {defaultMatcher} = require("matcher");
 const {RegExpFilter} = require("filterClasses");
-const {DownloadableSubscription} = require("subscriptionClasses");
 const {FilterNotifier} = require("filterNotifier");
 const {stringifyURL, getDecodedHostname,
        extractHostFromFrame, isThirdParty} = require("url");
 const {port} = require("messaging");
 const devtools = require("devtools");
 const {verifySignature} = require("rsa");
 
 let sitekeys = new ext.PageMap();
 
 function match(page, url, typeMask, docDomain, sitekey)
@@ skipping 142 matching lines @@
   let page = new ext.Page({id: details.tabId});
 
   for (let header of details.responseHeaders)
   {
     if (header.name.toLowerCase() == "x-adblock-key" && header.value)
     {
       let url = new URL(details.url);
       let key = checkKey(header.value, url);
       if (key)
       {
-        // For pre-rendered tabs we don't know for sure the navigation is going
-        // to happen until the onCommitted event fires. Unfortunately if we want
-        // sitekey whitelisting to work for requests made before onCommitted has
-        // been fired we must update the page structure now anyway.
-        ext._updatePageFrameStructure(details.frameId, details.tabId,
-                                      details.url, true);
         recordKey(key, page, url);
         break;
       }
     }
   }
 }
 
 if (typeof chrome == "object")
 {
   chrome.webRequest.onHeadersReceived.addListener(
     onHeadersReceived,
     {
       urls: ["http://*/*", "https://*/*"],
       types: ["main_frame", "sub_frame"]
     },
     ["responseHeaders"]
   );
 }