Issue 5464 - Upgrade to new asynchronous version of abp2blocklist

safari/contentBlocking.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * 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
@@ skipping 37 matching lines @@
     for (let page of pages)
       page.browserAction.setBadge();
   });
 }
 
 function setContentBlocker()
 {
   return new Promise((resolve, reject) =>
   {
     // Reset state and either fulfill or reject this promise.
-    let completePromise = error =>

[kzar, 2017/08/21 12:30:12]

Nit: Since this is a named function maybe just use the `function
completePromise(error)` syntax?

[Manish Jethani, 2017/08/21 14:17:04]

Done.

+    function completePromise(error)
     {
       lastSetContentBlockerError = error;
       contentBlockListDirty = false;
 
       if (error instanceof Error)
         reject(error);
       else
         resolve();
-    };
+    }
 
     // When given the same rules as last time setContentBlocker will always
     // resolve with null (success), even when there was actually an
     // error. We cache the last result therefore so that we can provide a
     // consistent result and also to avoid wastefully regenerating an identical
     // blocklist.
     if (!contentBlockListDirty)
     {
       completePromise(lastSetContentBlockerError);
       return;
@@ skipping 125 matching lines @@
     });
   });
 }
 
 port.on("safari.contentBlockingActive", (msg, sender) =>
 {
   if (!contentBlockingActive && afterContentBlockingFinished)
     return afterContentBlockingFinished;
   return contentBlockingActive;
 });