Issue 653 -Object.defineProperty instead of defineGetter / defineSetter

lib/utils.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 37 matching lines @@
   },
 
   /**
    * Returns whether we are running in Fennec, for Fennec-specific hacks
    * @type Boolean
    */
   get isFennec()
   {
     let {application} = require("info");
     let result = (application == "fennec" || application == "fennec2");
-    Utils.__defineGetter__("isFennec", () => result);
+    Object.defineProperty(this, "isFennec", {value: result});
     return result;
   },
 
   /**
    * Returns the user interface locale selected for adblockplus chrome package.
    */
   get appLocale()
   {
     let locale = "en-US";
     try
     {
       locale = Utils.chromeRegistry.getSelectedLocale("adblockplus");
     }
     catch (e)
     {
       Cu.reportError(e);
     }
-    Utils.__defineGetter__("appLocale", () => locale);
-    return Utils.appLocale;
+    Object.defineProperty(this, "appLocale", {value: locale});
+    return locale;
   },
 
   /**
    * Returns version of the Gecko platform
    */
   get platformVersion()
   {
     let platformVersion = Services.appinfo.platformVersion;
-    Utils.__defineGetter__("platformVersion", () => platformVersion);
-    return Utils.platformVersion;
+    Object.defineProperty(this, "platformVersion", {value: platformVersion});
+    return platformVersion;
   },
 
   /**
    * Retrieves a string from global.properties string bundle, will throw if string isn't found.
    *
    * @param {String} name  string name
    * @return {String}
    */
   getString: function(name)
   {
@@ skipping 680 matching lines @@
     Cu.reportError(e);
     // Expected, ctypes isn't supported in Gecko 1.9.2
     return null;
   }
 });
 
 if ("@mozilla.org/messenger/headerparser;1" in Cc)
   XPCOMUtils.defineLazyServiceGetter(Utils, "headerParser", "@mozilla.org/messenger/headerparser;1", "nsIMsgHeaderParser");
 else
   Utils.headerParser = null;