Backed out changeset 81c100a42bb6 (bug 1378342) for linting failures, e.g. in file_abort_controller.html. r=backout

--HG--
rename : dom/abort/FetchController.cpp => dom/fetch/FetchController.cpp
rename : dom/abort/FetchController.h => dom/fetch/FetchController.h
rename : dom/abort/FetchSignal.cpp => dom/fetch/FetchSignal.cpp
rename : dom/abort/FetchSignal.h => dom/fetch/FetchSignal.h
rename : dom/abort/tests/file_fetch_controller.html => dom/tests/mochitest/fetch/file_fetch_controller.html
rename : dom/abort/tests/test_fetch_controller.html => dom/tests/mochitest/fetch/test_fetch_controller.html
rename : dom/abort/tests/worker_fetch_controller.js => dom/tests/mochitest/fetch/worker_fetch_controller.js

dom/abort/moz.build

@@ -1,26 +0,0 @@
-# -*- 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'

dom/abort/tests/mochitest.ini

@@ -1,6 +0,0 @@
-[DEFAULT]
-support-files =
-  file_fetch_controller.html
-  worker_fetch_controller.js
-
-[test_fetch_controller.html]

dom/abort/tests/moz.build

@@ -1,7 +0,0 @@
-# -*- 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']

dom/fetch/FetchController.cpp

@@ -7,7 +7,6 @@
 #include "FetchController.h"
 #include "FetchSignal.h"
 #include "mozilla/dom/FetchControllerBinding.h"
-#include "WorkerPrivate.h"
 
 namespace mozilla {
 namespace dom {

dom/fetch/moz.build

@@ -11,9 +11,11 @@ EXPORTS.mozilla.dom += [
     'BodyExtractor.h',
     'ChannelInfo.h',
     'Fetch.h',
+    'FetchController.h',
     'FetchDriver.h',
     'FetchIPCTypes.h',
     'FetchObserver.h',
+    'FetchSignal.h',
     'FetchStreamReader.h',
     'FetchUtil.h',
     'Headers.h',
@@ -29,8 +31,10 @@ UNIFIED_SOURCES += [
     'ChannelInfo.cpp',
     'Fetch.cpp',
     'FetchConsumer.cpp',
+    'FetchController.cpp',
     'FetchDriver.cpp',
     'FetchObserver.cpp',
+    'FetchSignal.cpp',
     'FetchStream.cpp',
     'FetchStreamReader.cpp',
     'FetchUtil.cpp',

dom/moz.build

@@ -42,7 +42,6 @@ interfaces = [
 DIRS += ['interfaces/' + i for i in interfaces]
 
 DIRS += [
-    'abort',
     'animation',
     'base',
     'bindings',

dom/tests/mochitest/fetch/mochitest.ini

@@ -1,6 +1,7 @@
 [DEFAULT]
 support-files =
   fetch_test_framework.js
+  file_fetch_controller.html
   file_fetch_cached_redirect.html
   file_fetch_cached_redirect.html^headers^
   file_fetch_csp_block_frame.html
@@ -27,6 +28,7 @@ support-files =
   empty.js^headers^
   worker_temporaryFileBlob.js
   common_temporaryFileBlob.js
+  worker_fetch_controller.js
   common_readableStreams.js
   worker_readableStreams.js
   iframe_readableStreams.html
@@ -55,6 +57,7 @@ support-files =
 [test_fetch_basic_http_sw_reroute.html]
 [test_fetch_basic_http_sw_empty_reroute.html]
 [test_fetch_cached_redirect.html]
+[test_fetch_controller.html]
 [test_fetch_cors.html]
 skip-if = toolkit == 'android' && debug # Bug 1210282
 [test_fetch_cors_sw_reroute.html]