Issue 2040 - Replaced localStorage with chrome.storage.local

chrome/ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 499 matching lines @@
       items[key] = value;
       chrome.storage.local.set(items, callback);
     },
     remove: function(key, callback)
     {
       chrome.storage.local.remove(key, callback);
     },
     onChanged: chrome.storage.onChanged,
 
     // Migrate localStorage to chrome.storage.local,
-    // ignoring unkown and inavlid preferences.
-    migratePrefs: function(prefs)
+    // ignoring unkown and invalid preferences.
+    migratePrefs: function(hooks)
     {
       var items = {};
 
       for (let key in localStorage)
       {
-        var value = localStorage[key];
-
-        if (key in prefs)
-        {
-          try
-          {
-            items["pref:" + key] = JSON.parse(value);
-          }
-          catch (e)
-          {
-          }
-        }
-        else if (key == "currentVersion")
-        {
-          items[key] = value;
-        }
+        var item = hooks.map(key, localStorage[key]);
+        if (item)
+          items[item.key] = item.value;
       }

[Sebastian Noack, 2015/03/12 23:35:29]

Well, where doese code with a different implementation for both platforms belong
if not in the abstraction layer? But I'm fine with passing a map func instead an
object.

 
       chrome.storage.local.set(items, function() {
         localStorage.clear();
+        hooks.done();
       });
     }
   };
 
   /* Options */
 
   ext.showOptions = function(callback)
   {
     chrome.windows.getLastFocused(function(win)
     {
@@ skipping 19 matching lines @@
             callback(new Page(tab));
         }
         else
         {
           ext.pages.open(optionsUrl, callback);
         }
       });
     });
   };
 })();