Bug 1364050 - Part 1 - Remove the MOZ_JSDOWNLOADS configure option. r…

…=mak MozReview-Commit-ID: B73Ym5tD06R
mozilla-spidermonkey · May 5, 2017 · 67131c7 · 67131c7
1 parent 117ee19
commit 67131c7
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 255 deletions.
diff --git a/browser/confvars.sh b/browser/confvars.sh
@@ -60,7 +60,6 @@ else
   MAR_CHANNEL_ID=firefox-mozilla-central
 fi
 MOZ_PROFILE_MIGRATOR=1
-MOZ_JSDOWNLOADS=1
 
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=1

diff --git a/old-configure.in b/old-configure.in
@@ -4990,11 +4990,6 @@ if test "$MOZ_REQUIRE_SIGNING" = 1; then
   AC_DEFINE(MOZ_REQUIRE_SIGNING)
 fi
 
-AC_SUBST(MOZ_JSDOWNLOADS)
-if test -n "$MOZ_JSDOWNLOADS"; then
-  AC_DEFINE(MOZ_JSDOWNLOADS)
-fi
-
 dnl ========================================================
 dnl = Mac bundle name prefix
 dnl ========================================================

diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
@@ -958,13 +958,7 @@ nsDownloadManager::Init()
                                    getter_AddRefs(mBundle));
   NS_ENSURE_SUCCESS(rv, rv);
 
-#if !defined(MOZ_JSDOWNLOADS)
-  // When MOZ_JSDOWNLOADS is undefined, we still check the preference that can
-  // be used to enable the JavaScript API during the migration process.
-  mUseJSTransfer = Preferences::GetBool(PREF_BD_USEJSTRANSFER, false);
-#else
   mUseJSTransfer = true;
-#endif
 
   if (mUseJSTransfer)
     return NS_OK;

diff --git a/uriloader/exthandler/tests/moz.build b/uriloader/exthandler/tests/moz.build
@@ -10,11 +10,6 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 BROWSER_CHROME_MANIFESTS += ['mochitest/browser.ini']
 
-# The encoding test is already implemented in the Downloads API by a set of
-# test cases with the string "content_encoding" in their names.
-if not CONFIG['MOZ_JSDOWNLOADS']:
-    XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini']
-
 TESTING_JS_MODULES += [
     'HandlerServiceTestUtils.jsm',
 ]

diff --git a/uriloader/exthandler/tests/unit_ipc/test_encoding.js b/uriloader/exthandler/tests/unit_ipc/test_encoding.js
diff --git a/uriloader/exthandler/tests/unit_ipc/xpcshell.ini b/uriloader/exthandler/tests/unit_ipc/xpcshell.ini