[Pkg-mozext-commits] [requestpolicy] 115/280: [refact] "http-on-modify-request" -> ReqProcessor

[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 4485ef94967bed03e73171108477cbb1f17e08c1
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue Jan 6 09:58:24 2015 +0100

    [refact] "http-on-modify-request" -> ReqProcessor
    
    Formerly "http-on-modify-request" has been observed in
    rpService. Now rpService does not need to import
    RequestProcessor anymore.
---
 src/content/lib/request-processor.jsm      | 11 +++++++++--
 src/content/main/requestpolicy-service.jsm |  7 -------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/content/lib/request-processor.jsm b/src/content/lib/request-processor.jsm
index 92bb8f0..643da9e 100644
--- a/src/content/lib/request-processor.jsm
+++ b/src/content/lib/request-processor.jsm
@@ -47,7 +47,8 @@ ScriptLoader.importModules([
   "lib/utils",
   "lib/request",
   "lib/request-result",
-  "lib/request-set"
+  "lib/request-set",
+  "lib/process-environment"
 ], this);
 ScriptLoader.defineLazyModuleGetters({
   "lib/content-policy": ["PolicyImplementation"],
@@ -868,7 +869,7 @@ let RequestProcessor = (function(self) {
    * Currently this just looks for prefetch requests that are getting through
    * which we currently can't stop.
    */
-  self._examineHttpRequest = function(aSubject) {
+  let examineHttpRequest = function(aSubject) {
     var httpChannel = aSubject.QueryInterface(Ci.nsIHttpChannel);
     try {
       // Determine if prefetch requests are slipping through.
@@ -883,6 +884,12 @@ let RequestProcessor = (function(self) {
     }
   };
 
+  ProcessEnvironment.obMan.observe({
+    "http-on-modify-request": examineHttpRequest
+  });
+
+
+
   self._printAllowedRequests = function() {
     self._allowedRequests.print();
   };
diff --git a/src/content/main/requestpolicy-service.jsm b/src/content/main/requestpolicy-service.jsm
index 3248809..5eefc4d 100644
--- a/src/content/main/requestpolicy-service.jsm
+++ b/src/content/main/requestpolicy-service.jsm
@@ -36,7 +36,6 @@ ScriptLoader.importModules([
   "lib/prefs",
   "lib/utils/domains",
   "lib/policy-manager",
-  "lib/request-processor",
   "lib/subscription",
   "lib/utils",
   "lib/utils/constants",
@@ -165,7 +164,6 @@ let rpService = (function() {
   // start observers / listeners
   ProcessEnvironment.enqueueStartupFunction(function() {
     ProcessEnvironment.obMan.observe({
-      "http-on-modify-request": self.observe,
       "sessionstore-windows-restored": self.observe,
       "private-browsing": self.observe,
       SUBSCRIPTION_UPDATED_TOPIC: self.observe,
@@ -208,11 +206,6 @@ let rpService = (function() {
 
     observe: function(subject, topic, data) {
       switch (topic) {
-        case "http-on-modify-request" :
-          // TODO: observe "http-on-modify-request" not here, but in
-          //       RequestProcessor
-          RequestProcessor._examineHttpRequest(subject);
-          break;
         case SUBSCRIPTION_UPDATED_TOPIC:
           Logger.debug(Logger.TYPE_INTERNAL, 'XXX updated: ' + data);
           // TODO: check if the subscription is enabled. The user might have

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