From 3ca40609e184a4eba147194704f30ec0b3dae0e8 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Thu, 1 Dec 2016 18:38:11 -0800
Subject: [PATCH] Backed out changeset 4c343bdb6e2a (bug 1321615) for
 browser_ext_webRequest.js timeouts CLOSED TREE

---
 .../test/browser/browser_ext_webRequest.js    | 30 -------------------
 .../test/mochitest/head_webrequest.js         |  1 -
 2 files changed, 31 deletions(-)

diff --git a/browser/components/extensions/test/browser/browser_ext_webRequest.js b/browser/components/extensions/test/browser/browser_ext_webRequest.js
index 5bbe6cdd3988..ab9f58480d9e 100644
--- a/browser/components/extensions/test/browser/browser_ext_webRequest.js
+++ b/browser/components/extensions/test/browser/browser_ext_webRequest.js
@@ -26,33 +26,6 @@ function createHiddenBrowser(url) {
 
 let extension;
 let dummy = "http://mochi.test:8888/browser/browser/components/extensions/test/browser/file_dummy.html";
-let headers = {
-  request: {
-    add: {
-      "X-WebRequest-request": "text",
-      "X-WebRequest-request-binary": "binary",
-    },
-    modify: {
-      "user-agent": "WebRequest",
-    },
-    remove: [
-      "accept-encoding",
-    ],
-  },
-  response: {
-    add: {
-      "X-WebRequest-response": "text",
-      "X-WebRequest-response-binary": "binary",
-    },
-    modify: {
-      "server": "WebRequest",
-      "content-type": "text/html; charset=utf-8",
-    },
-    remove: [
-      "connection",
-    ],
-  },
-};
 
 add_task(function* setup() {
   // SelfSupport has a tendency to fire when running this test alone, without
@@ -68,7 +41,6 @@ add_task(function* test_newWindow() {
   let expect = {
     "file_dummy.html": {
       type: "main_frame",
-      headers,
     },
   };
   // NOTE: When running solo, favicon will be loaded at some point during
@@ -91,7 +63,6 @@ add_task(function* test_newTab() {
   let expect = {
     "file_dummy.html": {
       type: "main_frame",
-      headers,
     },
   };
   extension.sendMessage("set-expected", {expect, ignore: ["favicon.ico"]});
@@ -106,7 +77,6 @@ add_task(function* test_subframe() {
   let expect = {
     "file_dummy.html": {
       type: "main_frame",
-      headers,
     },
   };
   // test a content subframe attached to hidden window
diff --git a/toolkit/components/extensions/test/mochitest/head_webrequest.js b/toolkit/components/extensions/test/mochitest/head_webrequest.js
index 8fb8b9584c82..636776d0399a 100644
--- a/toolkit/components/extensions/test/mochitest/head_webrequest.js
+++ b/toolkit/components/extensions/test/mochitest/head_webrequest.js
@@ -90,7 +90,6 @@ function background(events) {
     expected.test[phase] = true;
 
     let headers = details[`${phase}Headers`];
-    browser.test.log(`headers are ${JSON.stringify(headers)}`);
     browser.test.assertTrue(Array.isArray(headers), `${phase}Headers array present`);
 
     let {add, modify, remove} = expected.headers[phase];