Bug 1363061 - Rename toolkit/components/jsdownloads to toolkit/components/downloads. r=mak

MozReview-Commit-ID: GuWeax0ubv3

browser/installer/package-manifest.in

@@ -222,6 +222,7 @@
 @RESPATH@/components/dom_workers.xpt
 @RESPATH@/components/dom_xul.xpt
 @RESPATH@/components/dom_presentation.xpt
+@RESPATH@/components/downloads.xpt
 @RESPATH@/components/editor.xpt
 @RESPATH@/components/enterprisepolicies.xpt
 @RESPATH@/components/extensions.xpt
@@ -236,7 +237,6 @@
 @RESPATH@/components/intl.xpt
 @RESPATH@/components/jar.xpt
 @RESPATH@/components/jsdebugger.xpt
-@RESPATH@/components/jsdownloads.xpt
 @RESPATH@/browser/components/jsinspector.xpt
 @RESPATH@/components/layout_base.xpt
 #ifdef MOZ_DEBUG

build/dumbmake-dependencies

@@ -60,7 +60,7 @@ browser/app
   browser/themes
   toolkit
   toolkit/components
-  toolkit/components/jsdownloads
+  toolkit/components/downloads
   toolkit/content
   toolkit/crashreporter
   toolkit/forgetaboutsite

mobile/android/installer/package-manifest.in

@@ -147,6 +147,7 @@
 @BINPATH@/components/dom_xhr.xpt
 @BINPATH@/components/dom_xul.xpt
 @BINPATH@/components/dom_presentation.xpt
+@BINPATH@/components/downloads.xpt
 @BINPATH@/components/editor.xpt
 @BINPATH@/components/extensions.xpt
 @BINPATH@/components/exthandler.xpt
@@ -160,7 +161,6 @@
 @BINPATH@/components/intl.xpt
 @BINPATH@/components/jar.xpt
 @BINPATH@/components/jsdebugger.xpt
-@BINPATH@/components/jsdownloads.xpt
 @BINPATH@/components/jsinspector.xpt
 @BINPATH@/components/layout_base.xpt
 #ifdef NS_PRINTING

testing/runtimes/mochitest-browser-chrome.runtimes.json

@@ -805,7 +805,7 @@
     "toolkit/components/addoncompat/tests/browser/browser_addonShims.js": 3823,
     "toolkit/components/extensions/test/browser/browser_ext_management_themes.js": 2922,
     "toolkit/components/extensions/test/browser/browser_ext_themes_persistence.js": 1948,
-    "toolkit/components/jsdownloads/test/browser/browser_DownloadPDFSaver.js": 4102,
+    "toolkit/components/downloads/test/browser/browser_DownloadPDFSaver.js": 4102,
     "toolkit/components/narrate/test/browser_narrate.js": 2700,
     "toolkit/components/narrate/test/browser_voiceselect.js": 2254,
     "toolkit/components/narrate/test/browser_word_highlight.js": 2215,

toolkit/components/build/moz.build

@@ -20,9 +20,9 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../../xre',
     '../alerts',
+    '../downloads',
     '../feeds',
     '../find',
-    '../jsdownloads/src',
     '../perfmonitoring',
     '../protobuf',
     '../reputationservice',

toolkit/components/downloads/DownloadPlatform.cpp

@@ -27,7 +27,7 @@
 
 #ifdef XP_MACOSX
 #include <CoreFoundation/CoreFoundation.h>
-#include "../../../../xpcom/io/CocoaFileUtils.h"
+#include "../../../xpcom/io/CocoaFileUtils.h"
 #endif
 
 #ifdef MOZ_WIDGET_ANDROID

toolkit/components/downloads/moz.build

@@ -4,6 +4,22 @@
 # 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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
+
+TEST_HARNESS_FILES.xpcshell.toolkit.components.downloads.test.data += [
+    'test/data/empty.txt',
+    'test/data/source.txt',
+]
+
+XPIDL_SOURCES += [
+    'mozIDownloadPlatform.idl',
+]
+
+XPIDL_MODULE = 'downloads'
+
+CXXFLAGS += CONFIG['TK_CFLAGS']
+
 SOURCES += [
     'DownloadPlatform.cpp',
 ]
@@ -30,4 +46,5 @@ if CONFIG['MOZ_PLACES']:
 
 FINAL_LIBRARY = 'xul'
 
-CXXFLAGS += CONFIG['TK_CFLAGS']
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Download Manager')

toolkit/components/jsdownloads/moz.build

@@ -1,18 +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 = ('Toolkit', 'Download Manager')
-
-DIRS += ['public', 'src']
-
-XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
-BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
-
-TEST_HARNESS_FILES.xpcshell.toolkit.components.jsdownloads.test.data += [
-    'test/data/empty.txt',
-    'test/data/source.txt',
-]

toolkit/components/jsdownloads/public/moz.build

@@ -1,9 +0,0 @@
-# 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/.
-
-XPIDL_MODULE = 'jsdownloads'
-
-XPIDL_SOURCES += [
-    'mozIDownloadPlatform.idl',
-]

toolkit/components/moz.build

@@ -29,12 +29,12 @@ DIRS += [
     'crashes',
     'crashmonitor',
     'diskspacewatcher',
+    'downloads',
     'enterprisepolicies',
     'extensions',
     'filewatcher',
     'finalizationwitness',
     'find',
-    'jsdownloads',
     'jsoncpp/src/lib_json',
     'lz4',
     'mediasniffer',

toolkit/content/contentAreaUtils.js

@@ -756,7 +756,7 @@ function uniqueFile(aLocalFile) {
 }
 
 /**
- * Download a URL using the new jsdownloads API.
+ * Download a URL using the Downloads API.
  *
  * @param aURL
  *        the url to download