From 04cd5ddc32b678b13281d031533e2f142e2e31d2 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Wed, 27 Sep 2017 03:50:46 +0200
Subject: [PATCH] Bug 1402317 - Remove dom.abortController.enabled and
 dom.abortController.fetch.enabled prefs, r=qdot

---
 dom/abort/AbortController.cpp                 | 38 ----------
 dom/abort/AbortController.h                   |  6 --
 dom/abort/tests/file_abort_controller.html    | 65 -----------------
 .../tests/file_abort_controller_fetch.html    | 72 -------------------
 dom/abort/tests/mochitest.ini                 |  2 -
 dom/abort/tests/test_abort_controller.html    | 64 +++++++++++++----
 .../tests/test_abort_controller_fetch.html    | 72 ++++++++++++++-----
 .../mochitest/fetch/test_fetch_observer.html  |  4 +-
 dom/webidl/AbortController.webidl             |  3 +-
 dom/webidl/AbortSignal.webidl                 |  3 +-
 dom/webidl/Request.webidl                     |  4 +-
 dom/workers/WorkerPrefs.h                     |  2 -
 modules/libpref/init/all.js                   |  6 --
 testing/web-platform/meta/dom/__dir__.ini     |  1 -
 .../web-platform/meta/dom/abort/__dir__.ini   |  1 -
 .../meta/fetch/api/abort/__dir__.ini          |  2 -
 16 files changed, 109 insertions(+), 236 deletions(-)
 delete mode 100644 dom/abort/tests/file_abort_controller.html
 delete mode 100644 dom/abort/tests/file_abort_controller_fetch.html
 delete mode 100644 testing/web-platform/meta/dom/__dir__.ini
 delete mode 100644 testing/web-platform/meta/dom/abort/__dir__.ini

diff --git a/dom/abort/AbortController.cpp b/dom/abort/AbortController.cpp
index 3430109a8e39..b0b7ed59faec 100644
--- a/dom/abort/AbortController.cpp
+++ b/dom/abort/AbortController.cpp
@@ -22,44 +22,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AbortController)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
-/* static */ bool
-AbortController::IsEnabled(JSContext* aCx, JSObject* aGlobal)
-{
-  if (NS_IsMainThread()) {
-    return Preferences::GetBool("dom.abortController.enabled", false);
-  }
-
-  using namespace workers;
-
-  // Otherwise, check the pref via the WorkerPrivate
-  WorkerPrivate* workerPrivate = GetWorkerPrivateFromContext(aCx);
-  if (!workerPrivate) {
-    return false;
-  }
-
-  return workerPrivate->AbortControllerEnabled();
-}
-
-/* static */ bool
-AbortController::IsEnabledInFetch(JSContext* aCx, JSObject* aGlobal)
-{
-  if (NS_IsMainThread()) {
-    return IsEnabled(aCx, aGlobal) &&
-           Preferences::GetBool("dom.abortController.fetch.enabled", false);
-  }
-
-  using namespace workers;
-
-  // Otherwise, check the pref via the WorkerPrivate
-  WorkerPrivate* workerPrivate = GetWorkerPrivateFromContext(aCx);
-  if (!workerPrivate) {
-    return false;
-  }
-
-  return workerPrivate->AbortControllerEnabled() &&
-         workerPrivate->AbortControllerEnabledInFetch();
-}
-
 /* static */ already_AddRefed<AbortController>
 AbortController::Constructor(const GlobalObject& aGlobal, ErrorResult& aRv)
 {
diff --git a/dom/abort/AbortController.h b/dom/abort/AbortController.h
index 05151ded14c6..cf96768b99b6 100644
--- a/dom/abort/AbortController.h
+++ b/dom/abort/AbortController.h
@@ -26,12 +26,6 @@ public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(AbortController)
 
-  static bool
-  IsEnabled(JSContext* aCx, JSObject* aGlobal);
-
-  static bool
-  IsEnabledInFetch(JSContext* aCx, JSObject* aGlobal);
-
   static already_AddRefed<AbortController>
   Constructor(const GlobalObject& aGlobal, ErrorResult& aRv);
 
diff --git a/dom/abort/tests/file_abort_controller.html b/dom/abort/tests/file_abort_controller.html
deleted file mode 100644
index a06fa3926597..000000000000
--- a/dom/abort/tests/file_abort_controller.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<script>
-function ok(a, msg) {
-  parent.postMessage({ type: "check", status: !!a, message: msg }, "*");
-}
-
-function is(a, b, msg) {
-  ok(a === b, msg);
-}
-
-function testWebIDL() {
-  ok("AbortController" in self, "We have a AbortController prototype");
-  ok("AbortSignal" in self, "We have a AbortSignal prototype");
-
-  var ac = new AbortController();
-  ok(!!ac, "AbortController can be created");
-  ok(ac instanceof AbortController, "AbortController is a AbortController");
-
-  ok(!!ac.signal, "AbortController has a signal");
-  ok(ac.signal instanceof AbortSignal, "abortSignal is a AbortSignal");
-  is(ac.signal.aborted, false, "By default AbortSignal.aborted is false");
-  next();
-}
-
-function testUpdateData() {
-  var ac = new AbortController();
-
-  is(ac.signal.aborted, false, "By default AbortSignal.aborted is false");
-
-  ac.abort();
-  is(ac.signal.aborted, true, "Signal is aborted");
-
-  next();
-}
-
-function testAbortEvent() {
-  var ac = new AbortController();
-  ac.signal.onabort = function(e) {
-    is(e.type, "abort", "Abort received");
-    next();
-  }
-  ac.abort();
-}
-
-var steps = [
-  // Simple stuff
-  testWebIDL,
-  testUpdateData,
-
-  // Event propagation
-  testAbortEvent,
-];
-
-function next() {
-  if (!steps.length) {
-    parent.postMessage({ type: "finish" }, "*");
-    return;
-  }
-
-  var step = steps.shift();
-  step();
-}
-
-next();
-
-</script>
diff --git a/dom/abort/tests/file_abort_controller_fetch.html b/dom/abort/tests/file_abort_controller_fetch.html
deleted file mode 100644
index ea959fdca83b..000000000000
--- a/dom/abort/tests/file_abort_controller_fetch.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<script>
-function ok(a, msg) {
-  parent.postMessage({ type: "check", status: !!a, message: msg }, "*");
-}
-
-function is(a, b, msg) {
-  ok(a === b, msg);
-}
-
-function testAbortedFetch() {
-  var ac = new AbortController();
-  ac.abort();
-
-  fetch("slow.sjs", { signal: ac.signal }).then(() => {
-    ok(false, "Fetch should not return a resolved promise");
-  }, e => {
-    is(e.name, "AbortError", "We have an abort error");
-  }).then(next);
-}
-
-function testFetchAndAbort() {
-  var ac = new AbortController();
-
-  var p = fetch("slow.sjs", { signal: ac.signal });
-  ac.abort();
-
-  p.then(() => {
-    ok(false, "Fetch should not return a resolved promise");
-  }, e => {
-    is(e.name, "AbortError", "We have an abort error");
-  }).then(next);
-}
-
-function testWorkerAbortedFetch() {
-  var w = new Worker("worker_abort_controller_fetch.js");
-  w.onmessage = function(e) {
-    ok(e.data, "Abort + Fetch works in workers");
-    next();
-  }
-  w.postMessage("testWorkerAbortedFetch");
-}
-
-function testWorkerFetchAndAbort() {
-  var w = new Worker("worker_abort_controller_fetch.js");
-  w.onmessage = function(e) {
-    ok(e.data, "Abort + Fetch works in workers");
-    next();
-  }
-  w.postMessage("testWorkerFetchAndAbort");
-}
-
-var steps = [
-  // fetch + signaling
-  testAbortedFetch,
-  testFetchAndAbort,
-  testWorkerAbortedFetch,
-  testWorkerFetchAndAbort,
-];
-
-function next() {
-  if (!steps.length) {
-    parent.postMessage({ type: "finish" }, "*");
-    return;
-  }
-
-  var step = steps.shift();
-  step();
-}
-
-next();
-
-</script>
diff --git a/dom/abort/tests/mochitest.ini b/dom/abort/tests/mochitest.ini
index 36e12bae8749..9817a9e9aa10 100644
--- a/dom/abort/tests/mochitest.ini
+++ b/dom/abort/tests/mochitest.ini
@@ -1,7 +1,5 @@
 [DEFAULT]
 support-files =
-  file_abort_controller.html
-  file_abort_controller_fetch.html
   worker_abort_controller_fetch.js
   slow.sjs
 
diff --git a/dom/abort/tests/test_abort_controller.html b/dom/abort/tests/test_abort_controller.html
index 2230dced357b..398b491ba5a9 100644
--- a/dom/abort/tests/test_abort_controller.html
+++ b/dom/abort/tests/test_abort_controller.html
@@ -12,27 +12,61 @@
 <body>
 <script class="testbody" type="text/javascript">
 
-SpecialPowers.pushPrefEnv({"set": [["dom.abortController.enabled", true ]]}, () => {
-  let ifr = document.createElement("iframe");
-  ifr.src = "file_abort_controller.html";
-  document.body.appendChild(ifr);
+function testWebIDL() {
+  ok("AbortController" in self, "We have a AbortController prototype");
+  ok("AbortSignal" in self, "We have a AbortSignal prototype");
 
-  window.onmessage = function(e) {
-    if (e.data.type == "finish") {
-      SimpleTest.finish();
-      return;
-    }
+  var ac = new AbortController();
+  ok(!!ac, "AbortController can be created");
+  ok(ac instanceof AbortController, "AbortController is a AbortController");
 
-    if (e.data.type == "check") {
-      ok(e.data.status, e.data.message);
-      return;
-    }
+  ok(!!ac.signal, "AbortController has a signal");
+  ok(ac.signal instanceof AbortSignal, "abortSignal is a AbortSignal");
+  is(ac.signal.aborted, false, "By default AbortSignal.aborted is false");
+  next();
+}
 
-    ok(false, "Something when wrong.");
+function testUpdateData() {
+  var ac = new AbortController();
+
+  is(ac.signal.aborted, false, "By default AbortSignal.aborted is false");
+
+  ac.abort();
+  is(ac.signal.aborted, true, "Signal is aborted");
+
+  next();
+}
+
+function testAbortEvent() {
+  var ac = new AbortController();
+  ac.signal.onabort = function(e) {
+    is(e.type, "abort", "Abort received");
+    next();
   }
-});
+  ac.abort();
+}
+
+var steps = [
+  // Simple stuff
+  testWebIDL,
+  testUpdateData,
+
+  // Event propagation
+  testAbortEvent,
+];
+
+function next() {
+  if (!steps.length) {
+    SimpleTest.finish();
+    return;
+  }
+
+  var step = steps.shift();
+  step();
+}
 
 SimpleTest.waitForExplicitFinish();
+next();
 
 </script>
 </body>
diff --git a/dom/abort/tests/test_abort_controller_fetch.html b/dom/abort/tests/test_abort_controller_fetch.html
index 24e005d1cb0c..334f25194d0f 100644
--- a/dom/abort/tests/test_abort_controller_fetch.html
+++ b/dom/abort/tests/test_abort_controller_fetch.html
@@ -12,28 +12,68 @@
 <body>
 <script class="testbody" type="text/javascript">
 
-SpecialPowers.pushPrefEnv({"set": [["dom.abortController.enabled", true ],
-                                   ["dom.abortController.fetch.enabled", true]]}, () => {
-  let ifr = document.createElement("iframe");
-  ifr.src = "file_abort_controller_fetch.html";
-  document.body.appendChild(ifr);
+function testAbortedFetch() {
+  var ac = new AbortController();
+  ac.abort();
 
-  window.onmessage = function(e) {
-    if (e.data.type == "finish") {
-      SimpleTest.finish();
-      return;
-    }
+  fetch("slow.sjs", { signal: ac.signal }).then(() => {
+    ok(false, "Fetch should not return a resolved promise");
+  }, e => {
+    is(e.name, "AbortError", "We have an abort error");
+  }).then(next);
+}
 
-    if (e.data.type == "check") {
-      ok(e.data.status, e.data.message);
-      return;
-    }
+function testFetchAndAbort() {
+  var ac = new AbortController();
 
-    ok(false, "Something when wrong.");
+  var p = fetch("slow.sjs", { signal: ac.signal });
+  ac.abort();
+
+  p.then(() => {
+    ok(false, "Fetch should not return a resolved promise");
+  }, e => {
+    is(e.name, "AbortError", "We have an abort error");
+  }).then(next);
+}
+
+function testWorkerAbortedFetch() {
+  var w = new Worker("worker_abort_controller_fetch.js");
+  w.onmessage = function(e) {
+    ok(e.data, "Abort + Fetch works in workers");
+    next();
   }
-});
+  w.postMessage("testWorkerAbortedFetch");
+}
+
+function testWorkerFetchAndAbort() {
+  var w = new Worker("worker_abort_controller_fetch.js");
+  w.onmessage = function(e) {
+    ok(e.data, "Abort + Fetch works in workers");
+    next();
+  }
+  w.postMessage("testWorkerFetchAndAbort");
+}
+
+var steps = [
+  // fetch + signaling
+  testAbortedFetch,
+  testFetchAndAbort,
+  testWorkerAbortedFetch,
+  testWorkerFetchAndAbort,
+];
+
+function next() {
+  if (!steps.length) {
+    SimpleTest.finish();
+    return;
+  }
+
+  var step = steps.shift();
+  step();
+}
 
 SimpleTest.waitForExplicitFinish();
+next();
 
 </script>
 </body>
diff --git a/dom/tests/mochitest/fetch/test_fetch_observer.html b/dom/tests/mochitest/fetch/test_fetch_observer.html
index 7475e06901f2..2b6c0362d264 100644
--- a/dom/tests/mochitest/fetch/test_fetch_observer.html
+++ b/dom/tests/mochitest/fetch/test_fetch_observer.html
@@ -12,9 +12,7 @@
 <body>
 <script class="testbody" type="text/javascript">
 
-SpecialPowers.pushPrefEnv({"set": [["dom.fetchObserver.enabled", true ],
-                                   ["dom.abortController.enabled", true ],
-                                   ["dom.abortController.fetch.enabled", true ]]}, () => {
+SpecialPowers.pushPrefEnv({"set": [["dom.fetchObserver.enabled", true ]]}, () => {
   let ifr = document.createElement('iframe');
   ifr.src = "file_fetch_observer.html";
   document.body.appendChild(ifr);
diff --git a/dom/webidl/AbortController.webidl b/dom/webidl/AbortController.webidl
index 185305fb3a27..10cd4b67d6e3 100644
--- a/dom/webidl/AbortController.webidl
+++ b/dom/webidl/AbortController.webidl
@@ -7,8 +7,7 @@
  * https://dom.spec.whatwg.org/#abortcontroller
  */
 
-[Constructor(), Exposed=(Window,Worker),
- Func="AbortController::IsEnabled"]
+[Constructor(), Exposed=(Window,Worker)]
 interface AbortController {
   readonly attribute AbortSignal signal;
 
diff --git a/dom/webidl/AbortSignal.webidl b/dom/webidl/AbortSignal.webidl
index 3eae8ca00c41..be8adc70b4b4 100644
--- a/dom/webidl/AbortSignal.webidl
+++ b/dom/webidl/AbortSignal.webidl
@@ -7,8 +7,7 @@
  * https://dom.spec.whatwg.org/#abortsignal
  */
 
-[Exposed=(Window,Worker),
- Func="AbortController::IsEnabled"]
+[Exposed=(Window,Worker)]
 interface AbortSignal : EventTarget {
   readonly attribute boolean aborted;
 
diff --git a/dom/webidl/Request.webidl b/dom/webidl/Request.webidl
index a5a33e542295..96b9e78b2c0e 100644
--- a/dom/webidl/Request.webidl
+++ b/dom/webidl/Request.webidl
@@ -27,8 +27,7 @@ interface Request {
   readonly attribute RequestRedirect redirect;
   readonly attribute DOMString integrity;
 
-  [Func="AbortController::IsEnabledInFetch",
-   BinaryName="getOrCreateSignal"]
+  [BinaryName="getOrCreateSignal"]
   readonly attribute AbortSignal signal;
 
   [Throws,
@@ -52,7 +51,6 @@ dictionary RequestInit {
   RequestRedirect redirect;
   DOMString integrity;
 
-  [Func="AbortController::IsEnabledInFetch"]
   AbortSignal? signal;
 
   [Func="FetchObserver::IsEnabled"]
diff --git a/dom/workers/WorkerPrefs.h b/dom/workers/WorkerPrefs.h
index 76aa2a0e4d7d..e1d8fb2f5f98 100644
--- a/dom/workers/WorkerPrefs.h
+++ b/dom/workers/WorkerPrefs.h
@@ -42,8 +42,6 @@ WORKER_SIMPLE_PREF("dom.requestcontext.enabled", RequestContextEnabled, REQUESTC
 WORKER_SIMPLE_PREF("gfx.offscreencanvas.enabled", OffscreenCanvasEnabled, OFFSCREENCANVAS_ENABLED)
 WORKER_SIMPLE_PREF("dom.webkitBlink.dirPicker.enabled", WebkitBlinkDirectoryPickerEnabled, DOM_WEBKITBLINK_DIRPICKER_WEBKITBLINK)
 WORKER_SIMPLE_PREF("dom.netinfo.enabled", NetworkInformationEnabled, NETWORKINFORMATION_ENABLED)
-WORKER_SIMPLE_PREF("dom.abortController.enabled", AbortControllerEnabled, ABORTCONTROLLER_ENABLED)
-WORKER_SIMPLE_PREF("dom.abortController.fetch.enabled", AbortControllerEnabledInFetch, ABORTCONTROLLER_FETCH_ENABLED)
 WORKER_SIMPLE_PREF("dom.fetchObserver.enabled", FetchObserverEnabled, FETCHOBSERVER_ENABLED)
 WORKER_SIMPLE_PREF("privacy.resistFingerprinting", ResistFingerprintingEnabled, RESISTFINGERPRINTING_ENABLED)
 WORKER_SIMPLE_PREF("devtools.enabled", DevToolsEnabled, DEVTOOLS_ENABLED)
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 54fa5de6db56..fdb5e18950a6 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5075,12 +5075,6 @@ pref("dom.battery.enabled", true);
 // Streams API
 pref("dom.streams.enabled", false);
 
-// Abort API
-pref("dom.abortController.enabled", true);
-
-// Fetch + Abort API
-pref("dom.abortController.fetch.enabled", true);
-
 // Push
 
 pref("dom.push.enabled", false);
diff --git a/testing/web-platform/meta/dom/__dir__.ini b/testing/web-platform/meta/dom/__dir__.ini
deleted file mode 100644
index d9b6de9f6983..000000000000
--- a/testing/web-platform/meta/dom/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-prefs: [dom.abortController.enabled:true]
diff --git a/testing/web-platform/meta/dom/abort/__dir__.ini b/testing/web-platform/meta/dom/abort/__dir__.ini
deleted file mode 100644
index d9b6de9f6983..000000000000
--- a/testing/web-platform/meta/dom/abort/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-prefs: [dom.abortController.enabled:true]
diff --git a/testing/web-platform/meta/fetch/api/abort/__dir__.ini b/testing/web-platform/meta/fetch/api/abort/__dir__.ini
index b8921281acfd..dee7d95a6bf3 100644
--- a/testing/web-platform/meta/fetch/api/abort/__dir__.ini
+++ b/testing/web-platform/meta/fetch/api/abort/__dir__.ini
@@ -1,4 +1,2 @@
 prefs: [javascript.options.streams:true,
-        dom.abortController.enabled:true,
-        dom.abortController.fetch.enabled:true,
         dom.streams.enabled:true]