[Pkg-mozext-commits] [requestpolicy] 10/50: [fix] compatibility with latest nightly

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit 51008014866976b1e3d6529682d3820922e9478b
Author: Martin Kimmerle <dev at 256k.de>
Date:   Mon Mar 28 21:21:18 2016 +0200

    [fix] compatibility with latest nightly
---
 src/content/lib/utils/info.jsm | 10 ++++++++--
 src/content/main/about-uri.jsm | 19 ++++++++++++++++---
 tests/mozrunner-prefs.ini      |  3 ++-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/content/lib/utils/info.jsm b/src/content/lib/utils/info.jsm
index 55c3b6d..cec9efd 100644
--- a/src/content/lib/utils/info.jsm
+++ b/src/content/lib/utils/info.jsm
@@ -89,11 +89,17 @@ var Info = (function() {
     }
   }
 
-  let appID = Services.appinfo.ID;
+  let {ID: appID, name: appName, platformVersion} = Services.appinfo;
   self.isFirefox = appID === C.FIREFOX_ID;
   self.isSeamonkey = appID === C.SEAMONKEY_ID;
+  self.isGecko = appName !== "Pale Moon";
   self.isAustralis = self.isFirefox &&
-      Services.vc.compare(Services.appinfo.platformVersion, "29") >= 0;
+      Services.vc.compare(platformVersion, "29") >= 0;
+
+  self.isGeckoVersionAtLeast = function(aMinVersion) {
+    return self.isGecko &&
+        Services.vc.compare(platformVersion, aMinVersion) >= 0;
+  };
 
   return self;
 }());
diff --git a/src/content/main/about-uri.jsm b/src/content/main/about-uri.jsm
index c6309d7..3529a7e 100644
--- a/src/content/main/about-uri.jsm
+++ b/src/content/main/about-uri.jsm
@@ -34,6 +34,7 @@ let {ScriptLoader: {importModule}} = Cu.import(
     "chrome://rpcontinued/content/lib/script-loader.jsm", {});
 let {Environment, ProcessEnvironment} = importModule("lib/environment");
 let {Utils} = importModule("lib/utils");
+let {Info} = importModule("lib/utils/info");
 
 //==============================================================================
 // utilities, constants
@@ -59,7 +60,8 @@ function getURI(aURI) {
   if (!id || !(id in FILENAMES)) {
     id = "basicprefs";
   }
-  return "chrome://rpcontinued/content/settings/" + FILENAMES[id];
+  let spec = "chrome://rpcontinued/content/settings/" + FILENAMES[id];
+  return Services.io.newURI(spec, null, null);
 }
 
 //==============================================================================
@@ -78,9 +80,20 @@ var AboutRequestPolicy = (function() {
     return Ci.nsIAboutModule.ALLOW_SCRIPT;
   };
 
-  self.newChannel = function(aURI) {
+  /**
+   * @param {nsIURI} aURI
+   * @param {nsILoadInfo} aLoadInfo Only available on Gecko 36+.
+   */
+  self.newChannel = function(aURI, aLoadInfo) {
     let uri = getURI(aURI);
-    let channel = Services.io.newChannel(uri, null, null);
+    let channel;
+    if (Info.isGeckoVersionAtLeast("48.0a1")) {
+      // newChannelFromURIWithLoadInfo is available since Gecko 48.
+      channel = Services.io.newChannelFromURIWithLoadInfo(uri, aLoadInfo);
+    } else {
+      // newChannel is obsolete since Gecko 48 (Bug 1254752)
+      channel = Services.io.newChannelFromURI(uri);
+    }
     channel.originalURI = aURI;
     return channel;
   };
diff --git a/tests/mozrunner-prefs.ini b/tests/mozrunner-prefs.ini
index 89d3fb7..27e6019 100644
--- a/tests/mozrunner-prefs.ini
+++ b/tests/mozrunner-prefs.ini
@@ -12,13 +12,14 @@ startup.homepage_welcome_url=http://www.maindomain.test
 extensions.requestpolicy.welcomeWindowShown:true
 browser.startup.page=0
 
-; disable data reporting
+; disable data reporting and telemetry
 datareporting.healthreport.service.enabled=false
 datareporting.healthreport.uploadEnabled=false
 datareporting.healthreport.service.firstRun=false
 datareporting.healthreport.logging.consoleEnabled=false
 datareporting.policy.dataSubmissionEnabled=false
 datareporting.policy.dataSubmissionPolicyAccepted=false
+toolkit.telemetry.enabled=false
 
 ; enable requestpolicy logging etc.
 extensions.requestpolicy.log=true

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git