issue #660 - Switch to version 2 of the HTTP cache API

chrome/content/ui/sidebar.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 282 matching lines @@
   }
 
   var showPreview = Prefs.previewimages && !("tooltip" in item);
   showPreview = showPreview && item.typeDescr == "IMAGE";
   showPreview = showPreview && (!item.filter || item.filter.disabled || item.filter instanceof WhitelistFilter);
   E("tooltipPreviewBox").hidden = true;
   if (showPreview)
   {
     if (!cacheStorage)
     {
+      let {Services} = Cu.import("resource://gre/modules/Services.jsm", null);
       // Cache v2 API is enabled by default starting with Gecko 32
       if (Services.vc.compare(Utils.platformVersion, "32.0") >= 0)
       {
         let {LoadContextInfo} = Cu.import("resource://gre/modules/LoadContextInfo.jsm", null);
-        let cacheService = Cc["@mozilla.org/netwerk/cache-storage-service;1"].getService(Ci.nsICacheStorageService);
-        cacheStorage = cacheService.diskCacheStorage(LoadContextInfo.default, true);

[Wladimir Palant, 2014/07/02 05:00:03]

Apparently, this interface was added to Services.jsm
(https://developer.mozilla.org/en-US/docs/Mozilla/JavaScript_code_modules/Serv...),
we should use it. Please import Services.jsm and use Services.cache2 here.

[saroyanm, 2014/07/02 07:03:41]

Good point.

+        cacheStorage = Services.cache2.diskCacheStorage(LoadContextInfo.default, true);
       }
       else
-      {
-        let cacheService = Cc["@mozilla.org/network/cache-service;1"].getService(Ci.nsICacheService);
-        cacheStorage = cacheService.createSession("HTTP", Ci.nsICache.STORE_ANYWHERE, true);

[Wladimir Palant, 2014/07/02 05:00:03]

We should use Services.cache here.

-      }
+        cacheStorage = Services.cache.createSession("HTTP", Ci.nsICache.STORE_ANYWHERE, true);
     }
     
     let showTooltipPreview = function ()
     {
       E("tooltipPreview").setAttribute("src", item.location);
       E("tooltipPreviewBox").hidden = false;
-    }

[Wladimir Palant, 2014/07/02 05:00:03]

Missing semicolon after } here.

[saroyanm, 2014/07/02 07:03:41]

Done.

+    };
     try
     {
       if (Ci.nsICacheStorage && cacheStorage instanceof Ci.nsICacheStorage)
       {
         cacheStorage.asyncOpenURI(Utils.makeURI(item.location), "", Ci.nsICacheStorage.OPEN_READONLY, {
           onCacheEntryCheck: function (entry, appCache)
           {
             return Ci.nsICacheEntryOpenCallback.ENTRY_WANTED;
           },
           onCacheEntryAvailable: function (entry, isNew, appCache, status) {
@@ skipping 928 matching lines @@
       return {tooltip: this.itemsDummyTooltip};
   },
 
   invalidateItem: function(item)
   {
     let row = this.data.indexOf(item);
     if (row >= 0)
       this.boxObject.invalidateRow(row);
   }
 }