13 files changed, 41 insertions, 7 deletions
diff --git a/dom/fetch/FetchController.cpp b/dom/abort/FetchController.cpp
index 2eb40b980..2eb40b980 100644
--- a/dom/fetch/FetchController.cpp
+++ b/dom/abort/FetchController.cpp
diff --git a/dom/fetch/FetchController.h b/dom/abort/FetchController.h
index 7a0132dca..7a0132dca 100644
--- a/dom/fetch/FetchController.h
+++ b/dom/abort/FetchController.h
diff --git a/dom/fetch/FetchSignal.cpp b/dom/abort/FetchSignal.cpp
index 07ad6b53d..07ad6b53d 100644
--- a/dom/fetch/FetchSignal.cpp
+++ b/dom/abort/FetchSignal.cpp
diff --git a/dom/fetch/FetchSignal.h b/dom/abort/FetchSignal.h
index 4970f03de..4970f03de 100644
--- a/dom/fetch/FetchSignal.h
+++ b/dom/abort/FetchSignal.h
diff --git a/dom/abort/moz.build b/dom/abort/moz.build
new file mode 100644
index 000000000..e7d8146e5
--- /dev/null
+++ b/dom/abort/moz.build
@@ -0,0 +1,26 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+with Files("**"):
+    BUG_COMPONENT = ("Core", "DOM")
+
+TEST_DIRS += ['tests']
+
+EXPORTS.mozilla.dom += [
+    'FetchController.h',
+    'FetchSignal.h',
+]
+
+UNIFIED_SOURCES += [
+    'FetchController.cpp',
+    'FetchSignal.cpp',
+]
+
+LOCAL_INCLUDES += [
+    '../workers',
+]
+
+FINAL_LIBRARY = 'xul'
diff --git a/dom/tests/mochitest/fetch/file_fetch_controller.html b/dom/abort/tests/file_fetch_controller.html
index e4137aac9..e4137aac9 100644
--- a/dom/tests/mochitest/fetch/file_fetch_controller.html
+++ b/dom/abort/tests/file_fetch_controller.html
diff --git a/dom/abort/tests/mochitest.ini b/dom/abort/tests/mochitest.ini
new file mode 100644
index 000000000..5ecc7048e
--- /dev/null
+++ b/dom/abort/tests/mochitest.ini
@@ -0,0 +1,6 @@
+[DEFAULT]
+support-files =
+  file_fetch_controller.html
+  worker_fetch_controller.js
+
+[test_fetch_controller.html]
diff --git a/dom/abort/tests/moz.build b/dom/abort/tests/moz.build
new file mode 100644
index 000000000..8e5cb5d71
--- /dev/null
+++ b/dom/abort/tests/moz.build
@@ -0,0 +1,8 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MOCHITEST_MANIFESTS += ['mochitest.ini']
+
diff --git a/dom/tests/mochitest/fetch/test_fetch_controller.html b/dom/abort/tests/test_fetch_controller.html
index 812fb9161..812fb9161 100644
--- a/dom/tests/mochitest/fetch/test_fetch_controller.html
+++ b/dom/abort/tests/test_fetch_controller.html
diff --git a/dom/tests/mochitest/fetch/worker_fetch_controller.js b/dom/abort/tests/worker_fetch_controller.js
index 6b008fea8..6b008fea8 100644
--- a/dom/tests/mochitest/fetch/worker_fetch_controller.js
+++ b/dom/abort/tests/worker_fetch_controller.js
diff --git a/dom/fetch/moz.build b/dom/fetch/moz.build
index 82fd99173..e2b466428 100644
--- a/dom/fetch/moz.build
+++ b/dom/fetch/moz.build
@@ -7,11 +7,9 @@
 EXPORTS.mozilla.dom += [
     'ChannelInfo.h',
     'Fetch.h',
-    'FetchController.h',
     'FetchDriver.h',
     'FetchIPCTypes.h',
     'FetchObserver.h',
-    'FetchSignal.h',
     'FetchUtil.h',
     'Headers.h',
     'InternalHeaders.h',
@@ -30,10 +28,8 @@ UNIFIED_SOURCES += [
 
 SOURCES += [
     'ChannelInfo.cpp',
-    'FetchController.cpp',
     'FetchDriver.cpp',
     'FetchObserver.cpp',
-    'FetchSignal.cpp',
     'FetchUtil.cpp',
     'Headers.cpp',
     'InternalHeaders.cpp',
diff --git a/dom/moz.build b/dom/moz.build
index 89c539b4b..8a958982f 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -37,6 +37,7 @@ interfaces = [
 DIRS += ['interfaces/' + i for i in interfaces]
 
 DIRS += [
+    'abort',
     'animation',
     'apps',
     'base',
diff --git a/dom/tests/mochitest/fetch/mochitest.ini b/dom/tests/mochitest/fetch/mochitest.ini
index 7493ede50..a9447d0d9 100644
--- a/dom/tests/mochitest/fetch/mochitest.ini
+++ b/dom/tests/mochitest/fetch/mochitest.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 support-files =
   fetch_test_framework.js
-  file_fetch_controller.html
   test_fetch_basic.js
   test_fetch_basic_http.js
   test_fetch_cors.js
@@ -23,7 +22,6 @@ support-files =
   empty.js^headers^
   worker_temporaryFileBlob.js
   common_temporaryFileBlob.js
-  worker_fetch_controller.js
   !/dom/xhr/tests/file_XHR_binary1.bin
   !/dom/xhr/tests/file_XHR_binary1.bin^headers^
   !/dom/xhr/tests/file_XHR_binary2.bin
@@ -45,7 +43,6 @@ support-files =
 [test_fetch_basic_http.html]
 [test_fetch_basic_http_sw_reroute.html]
 [test_fetch_basic_http_sw_empty_reroute.html]
-[test_fetch_controller.html]
 [test_fetch_cors.html]
 skip-if = toolkit == 'android' # Bug 1210282
 [test_fetch_cors_sw_reroute.html]