From 57a2cad6e6697688ce10b7d567f2455872e27a74 Mon Sep 17 00:00:00 2001
From: Coroiu Cristina <ccoroiu@mozilla.com>
Date: Sat, 24 Aug 2019 00:06:37 +0300
Subject: [PATCH] Backed out changeset 8628b6ec7506 (bug 1576252) for multiple
 failures at components/extensions/test/xpcshell/test_webRequest_filtering.js
 on a CLOSED TREE

---
 .../test/mochitest/test_ext_activityLog.html  | 22 -------------------
 .../extensions/webrequest/WebRequest.jsm      | 17 +++++++-------
 2 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/toolkit/components/extensions/test/mochitest/test_ext_activityLog.html b/toolkit/components/extensions/test/mochitest/test_ext_activityLog.html
index c2dbeaa4b6fc..5561c0f23ff5 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_activityLog.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_activityLog.html
@@ -16,27 +16,6 @@
 add_task(async function test_api() {
   let URL = "http://mochi.test:8888/tests/toolkit/components/extensions/test/mochitest/file_sample.html";
 
-  // Test that an unspecified extension is not logged by the watcher extension.
-  let unlogged = ExtensionTestUtils.loadExtension({
-    isPrivileged: true,
-    manifest: {
-      applications: { gecko: { id: "unlogged@tests.mozilla.org" } },
-      permissions: ["webRequest", "webRequestBlocking", "<all_urls>"],
-    },
-    background() {
-      // This privileged test extension should not affect the webRequest
-      // data received by non-privileged extensions (See Bug 1576272).
-      browser.webRequest.onBeforeRequest.addListener(
-        details => {
-          return { cancel: false };
-        },
-        { urls: ["http://mochi.test/*/file_sample.html"] },
-        ["blocking"]
-      );
-    },
-  });
-  await unlogged.startup();
-
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       applications: { gecko: { id: "watched@tests.mozilla.org" } },
@@ -301,7 +280,6 @@ add_task(async function test_api() {
   ]);
 
   await extension.unload();
-  await unlogged.unload();
   await logger.unload();
 });
 
diff --git a/toolkit/components/extensions/webrequest/WebRequest.jsm b/toolkit/components/extensions/webrequest/WebRequest.jsm
index 44bb99a8c111..2a3b1d1105ac 100644
--- a/toolkit/components/extensions/webrequest/WebRequest.jsm
+++ b/toolkit/components/extensions/webrequest/WebRequest.jsm
@@ -757,7 +757,7 @@ HttpObserverManager = {
     }
   },
 
-  getRequestData(channel, extraData) {
+  getRequestData(channel, extraData, policy) {
     let originAttributes =
       channel.loadInfo && channel.loadInfo.originAttributes;
     let data = {
@@ -784,6 +784,12 @@ HttpObserverManager = {
       serialize: serializeRequestData,
     };
 
+    // We're limiting access to
+    // urlClassification while the feature is further fleshed out.
+    if (policy && policy.extension.isPrivileged) {
+      data.urlClassification = channel.urlClassification;
+    }
+
     return Object.assign(data, extraData);
   },
 
@@ -839,7 +845,7 @@ HttpObserverManager = {
         }
 
         if (!commonData) {
-          commonData = this.getRequestData(channel, extraData);
+          commonData = this.getRequestData(channel, extraData, opts.extension);
           if (this.STATUS_TYPES.has(kind)) {
             commonData.statusCode = channel.statusCode;
             commonData.statusLine = channel.statusLine;
@@ -847,13 +853,6 @@ HttpObserverManager = {
         }
         let data = Object.create(commonData);
 
-        // We're limiting access to urlClassification while the feature is
-        // further fleshed out.
-        let { policy } = opts.extension;
-        if (policy && policy.extension.isPrivileged) {
-          data.urlClassification = channel.urlClassification;
-        }
-
         if (registerFilter && opts.blocking && opts.extension) {
           data.registerTraceableChannel = (extension, remoteTab) => {
             // `channel` is a ChannelWrapper, which contains the actual