Bug 644626 - Move plugin tests from modules/plugin/test to dom/plugin/test, r=ted
authorBenjamin Smedberg <benjamin@smedbergs.us>
Wed, 18 May 2011 09:05:24 -0400
changeset 69670 f5ac9367f1e15ca931afebc8b986e32ad11fc21d
parent 69669 d40eac0106f52ef4a6834616b7a53cefe62c0af0
child 69671 195b5dc114c53a4feac0fdf3178017f612149011
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersted
bugs644626
milestone6.0a1
Bug 644626 - Move plugin tests from modules/plugin/test to dom/plugin/test, r=ted
dom/Makefile.in
dom/plugins/base/Makefile.in
dom/plugins/test/Makefile.in
dom/plugins/test/crashtests/110650-1.html
dom/plugins/test/crashtests/41276-1.html
dom/plugins/test/crashtests/48856-1.html
dom/plugins/test/crashtests/539897-1.html
dom/plugins/test/crashtests/540114-1.html
dom/plugins/test/crashtests/570884.html
dom/plugins/test/crashtests/598862.html
dom/plugins/test/crashtests/626602-1.html
dom/plugins/test/crashtests/crashtests.list
dom/plugins/test/mochitest/307-xo-redirect.sjs
dom/plugins/test/mochitest/Makefile.in
dom/plugins/test/mochitest/cocoa_focus.html
dom/plugins/test/mochitest/cocoa_window_focus.html
dom/plugins/test/mochitest/crashing_subpage.html
dom/plugins/test/mochitest/large-pic.jpg
dom/plugins/test/mochitest/loremipsum.txt
dom/plugins/test/mochitest/loremipsum.xtest
dom/plugins/test/mochitest/loremipsum.xtest^headers^
dom/plugins/test/mochitest/loremipsum_file.txt
dom/plugins/test/mochitest/loremipsum_nocache.txt
dom/plugins/test/mochitest/loremipsum_nocache.txt^headers^
dom/plugins/test/mochitest/neverending.sjs
dom/plugins/test/mochitest/plugin_visibility_loader.html
dom/plugins/test/mochitest/plugin_window.html
dom/plugins/test/mochitest/pluginstream.js
dom/plugins/test/mochitest/post.sjs
dom/plugins/test/mochitest/test_GCrace.html
dom/plugins/test/mochitest/test_bug479979.xul
dom/plugins/test/mochitest/test_bug532208.html
dom/plugins/test/mochitest/test_bug539565-1.html
dom/plugins/test/mochitest/test_bug539565-2.html
dom/plugins/test/mochitest/test_clear_site_data.html
dom/plugins/test/mochitest/test_cocoa_focus.html
dom/plugins/test/mochitest/test_cocoa_window_focus.html
dom/plugins/test/mochitest/test_convertpoint.xul
dom/plugins/test/mochitest/test_cookies.html
dom/plugins/test/mochitest/test_copyText.html
dom/plugins/test/mochitest/test_crash_nested_loop.html
dom/plugins/test/mochitest/test_crash_notify.xul
dom/plugins/test/mochitest/test_crash_notify_no_report.xul
dom/plugins/test/mochitest/test_crash_submit.xul
dom/plugins/test/mochitest/test_crashing.html
dom/plugins/test/mochitest/test_crashing2.html
dom/plugins/test/mochitest/test_enumerate.html
dom/plugins/test/mochitest/test_fullpage.html
dom/plugins/test/mochitest/test_getauthenticationinfo.html
dom/plugins/test/mochitest/test_hanging.html
dom/plugins/test/mochitest/test_instantiation.html
dom/plugins/test/mochitest/test_multipleinstanceobjects.html
dom/plugins/test/mochitest/test_newstreamondestroy.html
dom/plugins/test/mochitest/test_npn_asynccall.html
dom/plugins/test/mochitest/test_npn_timers.html
dom/plugins/test/mochitest/test_npobject_getters.html
dom/plugins/test/mochitest/test_npruntime.xul
dom/plugins/test/mochitest/test_npruntime_construct.html
dom/plugins/test/mochitest/test_npruntime_identifiers.html
dom/plugins/test/mochitest/test_npruntime_npnevaluate.html
dom/plugins/test/mochitest/test_npruntime_npninvoke.html
dom/plugins/test/mochitest/test_npruntime_npninvokedefault.html
dom/plugins/test/mochitest/test_npruntime_npnsetexception.html
dom/plugins/test/mochitest/test_painting.html
dom/plugins/test/mochitest/test_plugin_scroll_painting.html
dom/plugins/test/mochitest/test_pluginstream_asfile.html
dom/plugins/test/mochitest/test_pluginstream_asfileonly.html
dom/plugins/test/mochitest/test_pluginstream_err.html
dom/plugins/test/mochitest/test_pluginstream_geturl.html
dom/plugins/test/mochitest/test_pluginstream_geturlnotify.html
dom/plugins/test/mochitest/test_pluginstream_newstream.html
dom/plugins/test/mochitest/test_pluginstream_post.html
dom/plugins/test/mochitest/test_pluginstream_poststream.html
dom/plugins/test/mochitest/test_pluginstream_seek.html
dom/plugins/test/mochitest/test_pluginstream_seek_close.html
dom/plugins/test/mochitest/test_pluginstream_src.html
dom/plugins/test/mochitest/test_positioning.html
dom/plugins/test/mochitest/test_privatemode.xul
dom/plugins/test/mochitest/test_propertyAndMethod.html
dom/plugins/test/mochitest/test_redirect_handling.html
dom/plugins/test/mochitest/test_streamNotify.html
dom/plugins/test/mochitest/test_streamatclose.html
dom/plugins/test/mochitest/test_twostreams.html
dom/plugins/test/mochitest/test_visibility.html
dom/plugins/test/mochitest/test_windowed_invalidate.html
dom/plugins/test/mochitest/test_wmode.xul
dom/plugins/test/mochitest/test_xulbrowser_plugin_visibility.xul
dom/plugins/test/mochitest/test_zero_opacity.html
dom/plugins/test/mochitest/utils.js
dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
dom/plugins/test/reftest/border-padding-1-ref.html
dom/plugins/test/reftest/border-padding-1.html
dom/plugins/test/reftest/border-padding-2-ref.html
dom/plugins/test/reftest/border-padding-2.html
dom/plugins/test/reftest/border-padding-3-ref.html
dom/plugins/test/reftest/border-padding-3.html
dom/plugins/test/reftest/div-alpha-opacity.html
dom/plugins/test/reftest/div-alpha-zindex.html
dom/plugins/test/reftest/div-sanity.html
dom/plugins/test/reftest/plugin-alpha-opacity.html
dom/plugins/test/reftest/plugin-alpha-zindex.html
dom/plugins/test/reftest/plugin-background-1-step.html
dom/plugins/test/reftest/plugin-background-10-step.html
dom/plugins/test/reftest/plugin-background-2-step.html
dom/plugins/test/reftest/plugin-background-5-step.html
dom/plugins/test/reftest/plugin-background-ref.html
dom/plugins/test/reftest/plugin-background.css
dom/plugins/test/reftest/plugin-background.html
dom/plugins/test/reftest/plugin-background.js
dom/plugins/test/reftest/plugin-busy-alpha-zindex.html
dom/plugins/test/reftest/plugin-canvas-alpha-zindex.html
dom/plugins/test/reftest/plugin-sanity.html
dom/plugins/test/reftest/plugin-transform-1-ref.html
dom/plugins/test/reftest/plugin-transform-1.html
dom/plugins/test/reftest/plugin-transform-2-ref.html
dom/plugins/test/reftest/plugin-transform-2.html
dom/plugins/test/reftest/plugin-transform-alpha-zindex.html
dom/plugins/test/reftest/pluginproblemui-direction-1-ref.html
dom/plugins/test/reftest/pluginproblemui-direction-1.html
dom/plugins/test/reftest/pluginproblemui-direction-2-ref.html
dom/plugins/test/reftest/pluginproblemui-direction-2.html
dom/plugins/test/reftest/reftest.list
dom/plugins/test/reftest/windowless-clipping-1-ref.html
dom/plugins/test/reftest/windowless-clipping-1.html
dom/plugins/test/testplugin/Info.plist
dom/plugins/test/testplugin/Makefile.in
dom/plugins/test/testplugin/README
dom/plugins/test/testplugin/nptest.cpp
dom/plugins/test/testplugin/nptest.def
dom/plugins/test/testplugin/nptest.h
dom/plugins/test/testplugin/nptest.rc
dom/plugins/test/testplugin/nptest_droid.cpp
dom/plugins/test/testplugin/nptest_gtk2.cpp
dom/plugins/test/testplugin/nptest_macosx.mm
dom/plugins/test/testplugin/nptest_os2.cpp
dom/plugins/test/testplugin/nptest_platform.h
dom/plugins/test/testplugin/nptest_qt.cpp
dom/plugins/test/testplugin/nptest_utils.cpp
dom/plugins/test/testplugin/nptest_utils.h
dom/plugins/test/testplugin/nptest_windows.cpp
dom/plugins/test/unit/head_plugins.js
dom/plugins/test/unit/test_bug455213.js
dom/plugins/test/unit/test_bug471245.js
layout/reftests/reftest.list
modules/plugin/Makefile.in
modules/plugin/test/Makefile.in
modules/plugin/test/crashtests/110650-1.html
modules/plugin/test/crashtests/41276-1.html
modules/plugin/test/crashtests/48856-1.html
modules/plugin/test/crashtests/539897-1.html
modules/plugin/test/crashtests/540114-1.html
modules/plugin/test/crashtests/570884.html
modules/plugin/test/crashtests/598862.html
modules/plugin/test/crashtests/626602-1.html
modules/plugin/test/crashtests/crashtests.list
modules/plugin/test/mochitest/307-xo-redirect.sjs
modules/plugin/test/mochitest/Makefile.in
modules/plugin/test/mochitest/cocoa_focus.html
modules/plugin/test/mochitest/cocoa_window_focus.html
modules/plugin/test/mochitest/crashing_subpage.html
modules/plugin/test/mochitest/large-pic.jpg
modules/plugin/test/mochitest/loremipsum.txt
modules/plugin/test/mochitest/loremipsum.xtest
modules/plugin/test/mochitest/loremipsum.xtest^headers^
modules/plugin/test/mochitest/loremipsum_file.txt
modules/plugin/test/mochitest/loremipsum_nocache.txt
modules/plugin/test/mochitest/loremipsum_nocache.txt^headers^
modules/plugin/test/mochitest/neverending.sjs
modules/plugin/test/mochitest/plugin_visibility_loader.html
modules/plugin/test/mochitest/plugin_window.html
modules/plugin/test/mochitest/pluginstream.js
modules/plugin/test/mochitest/post.sjs
modules/plugin/test/mochitest/test_GCrace.html
modules/plugin/test/mochitest/test_bug479979.xul
modules/plugin/test/mochitest/test_bug532208.html
modules/plugin/test/mochitest/test_bug539565-1.html
modules/plugin/test/mochitest/test_bug539565-2.html
modules/plugin/test/mochitest/test_clear_site_data.html
modules/plugin/test/mochitest/test_cocoa_focus.html
modules/plugin/test/mochitest/test_cocoa_window_focus.html
modules/plugin/test/mochitest/test_convertpoint.xul
modules/plugin/test/mochitest/test_cookies.html
modules/plugin/test/mochitest/test_copyText.html
modules/plugin/test/mochitest/test_crash_nested_loop.html
modules/plugin/test/mochitest/test_crash_notify.xul
modules/plugin/test/mochitest/test_crash_notify_no_report.xul
modules/plugin/test/mochitest/test_crash_submit.xul
modules/plugin/test/mochitest/test_crashing.html
modules/plugin/test/mochitest/test_crashing2.html
modules/plugin/test/mochitest/test_enumerate.html
modules/plugin/test/mochitest/test_fullpage.html
modules/plugin/test/mochitest/test_getauthenticationinfo.html
modules/plugin/test/mochitest/test_hanging.html
modules/plugin/test/mochitest/test_instantiation.html
modules/plugin/test/mochitest/test_multipleinstanceobjects.html
modules/plugin/test/mochitest/test_newstreamondestroy.html
modules/plugin/test/mochitest/test_npn_asynccall.html
modules/plugin/test/mochitest/test_npn_timers.html
modules/plugin/test/mochitest/test_npobject_getters.html
modules/plugin/test/mochitest/test_npruntime.xul
modules/plugin/test/mochitest/test_npruntime_construct.html
modules/plugin/test/mochitest/test_npruntime_identifiers.html
modules/plugin/test/mochitest/test_npruntime_npnevaluate.html
modules/plugin/test/mochitest/test_npruntime_npninvoke.html
modules/plugin/test/mochitest/test_npruntime_npninvokedefault.html
modules/plugin/test/mochitest/test_npruntime_npnsetexception.html
modules/plugin/test/mochitest/test_painting.html
modules/plugin/test/mochitest/test_plugin_scroll_painting.html
modules/plugin/test/mochitest/test_pluginstream_asfile.html
modules/plugin/test/mochitest/test_pluginstream_asfileonly.html
modules/plugin/test/mochitest/test_pluginstream_err.html
modules/plugin/test/mochitest/test_pluginstream_geturl.html
modules/plugin/test/mochitest/test_pluginstream_geturlnotify.html
modules/plugin/test/mochitest/test_pluginstream_newstream.html
modules/plugin/test/mochitest/test_pluginstream_post.html
modules/plugin/test/mochitest/test_pluginstream_poststream.html
modules/plugin/test/mochitest/test_pluginstream_seek.html
modules/plugin/test/mochitest/test_pluginstream_seek_close.html
modules/plugin/test/mochitest/test_pluginstream_src.html
modules/plugin/test/mochitest/test_positioning.html
modules/plugin/test/mochitest/test_privatemode.xul
modules/plugin/test/mochitest/test_propertyAndMethod.html
modules/plugin/test/mochitest/test_redirect_handling.html
modules/plugin/test/mochitest/test_streamNotify.html
modules/plugin/test/mochitest/test_streamatclose.html
modules/plugin/test/mochitest/test_twostreams.html
modules/plugin/test/mochitest/test_visibility.html
modules/plugin/test/mochitest/test_windowed_invalidate.html
modules/plugin/test/mochitest/test_wmode.xul
modules/plugin/test/mochitest/test_xulbrowser_plugin_visibility.xul
modules/plugin/test/mochitest/test_zero_opacity.html
modules/plugin/test/mochitest/utils.js
modules/plugin/test/mochitest/xulbrowser_plugin_visibility.xul
modules/plugin/test/reftest/border-padding-1-ref.html
modules/plugin/test/reftest/border-padding-1.html
modules/plugin/test/reftest/border-padding-2-ref.html
modules/plugin/test/reftest/border-padding-2.html
modules/plugin/test/reftest/border-padding-3-ref.html
modules/plugin/test/reftest/border-padding-3.html
modules/plugin/test/reftest/div-alpha-opacity.html
modules/plugin/test/reftest/div-alpha-zindex.html
modules/plugin/test/reftest/div-sanity.html
modules/plugin/test/reftest/plugin-alpha-opacity.html
modules/plugin/test/reftest/plugin-alpha-zindex.html
modules/plugin/test/reftest/plugin-background-1-step.html
modules/plugin/test/reftest/plugin-background-10-step.html
modules/plugin/test/reftest/plugin-background-2-step.html
modules/plugin/test/reftest/plugin-background-5-step.html
modules/plugin/test/reftest/plugin-background-ref.html
modules/plugin/test/reftest/plugin-background.css
modules/plugin/test/reftest/plugin-background.html
modules/plugin/test/reftest/plugin-background.js
modules/plugin/test/reftest/plugin-busy-alpha-zindex.html
modules/plugin/test/reftest/plugin-canvas-alpha-zindex.html
modules/plugin/test/reftest/plugin-sanity.html
modules/plugin/test/reftest/plugin-transform-1-ref.html
modules/plugin/test/reftest/plugin-transform-1.html
modules/plugin/test/reftest/plugin-transform-2-ref.html
modules/plugin/test/reftest/plugin-transform-2.html
modules/plugin/test/reftest/plugin-transform-alpha-zindex.html
modules/plugin/test/reftest/pluginproblemui-direction-1-ref.html
modules/plugin/test/reftest/pluginproblemui-direction-1.html
modules/plugin/test/reftest/pluginproblemui-direction-2-ref.html
modules/plugin/test/reftest/pluginproblemui-direction-2.html
modules/plugin/test/reftest/reftest.list
modules/plugin/test/reftest/windowless-clipping-1-ref.html
modules/plugin/test/reftest/windowless-clipping-1.html
modules/plugin/test/testplugin/Info.plist
modules/plugin/test/testplugin/Makefile.in
modules/plugin/test/testplugin/README
modules/plugin/test/testplugin/nptest.cpp
modules/plugin/test/testplugin/nptest.def
modules/plugin/test/testplugin/nptest.h
modules/plugin/test/testplugin/nptest.rc
modules/plugin/test/testplugin/nptest_droid.cpp
modules/plugin/test/testplugin/nptest_gtk2.cpp
modules/plugin/test/testplugin/nptest_macosx.mm
modules/plugin/test/testplugin/nptest_os2.cpp
modules/plugin/test/testplugin/nptest_platform.h
modules/plugin/test/testplugin/nptest_qt.cpp
modules/plugin/test/testplugin/nptest_utils.cpp
modules/plugin/test/testplugin/nptest_utils.h
modules/plugin/test/testplugin/nptest_windows.cpp
modules/plugin/test/unit/head_plugins.js
modules/plugin/test/unit/test_bug455213.js
modules/plugin/test/unit/test_bug471245.js
testing/crashtest/crashtests.list
testing/mochitest/runtests.py
testing/testsuite-targets.mk
toolkit/toolkit-makefiles.sh
toolkit/toolkit-tiers.mk
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@@ -76,19 +76,27 @@ endif
 
 DIRS += \
   public/coreEvents \
   base \
   src \
   locales \
   plugins/base \
   plugins/ipc \
+  plugins/test \
   indexedDB \
   system \
   ipc \
   $(NULL)
 
 ifdef ENABLE_TESTS
 DIRS += tests
+
+# These subdirs rely on GTK libraries and header files, it is not
+#  buildable on other non-GTK unix builds
+
+ifneq (,$(filter gtk2 cocoa windows android qt os2,$(MOZ_WIDGET_TOOLKIT)))
+DIRS += plugins/test
+endif
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@@ -160,8 +160,12 @@ EXTRA_DSO_LDOPTS += $(TK_LIBS)
 ifdef MOZ_ENABLE_GTK2
 EXTRA_DSO_LDOPTS += -lgtkxtbin $(XLDFLAGS) $(XT_LIBS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS)
 endif           #MOZ_ENABLE_GTK2
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 EXTRA_DSO_LDOPTS += $(XEXT_LIBS) $(XCOMPOSITE_LIBS)
 endif
 
+$(DIST)/bin/plugins:
+	$(NSINSTALL) -D $@
+
+export:: $(DIST)/bin/plugins
rename from modules/plugin/test/Makefile.in
rename to dom/plugins/test/Makefile.in
--- a/modules/plugin/test/Makefile.in
+++ b/dom/plugins/test/Makefile.in
@@ -35,17 +35,17 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir = modules/plugin/test
+relativesrcdir = dom/plugins/test
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_plugin
 
 DIRS = testplugin
 
 XPCSHELL_TESTS = \
rename from modules/plugin/test/crashtests/110650-1.html
rename to dom/plugins/test/crashtests/110650-1.html
rename from modules/plugin/test/crashtests/41276-1.html
rename to dom/plugins/test/crashtests/41276-1.html
rename from modules/plugin/test/crashtests/48856-1.html
rename to dom/plugins/test/crashtests/48856-1.html
rename from modules/plugin/test/crashtests/539897-1.html
rename to dom/plugins/test/crashtests/539897-1.html
rename from modules/plugin/test/crashtests/540114-1.html
rename to dom/plugins/test/crashtests/540114-1.html
rename from modules/plugin/test/crashtests/570884.html
rename to dom/plugins/test/crashtests/570884.html
rename from modules/plugin/test/crashtests/598862.html
rename to dom/plugins/test/crashtests/598862.html
rename from modules/plugin/test/crashtests/626602-1.html
rename to dom/plugins/test/crashtests/626602-1.html
rename from modules/plugin/test/crashtests/crashtests.list
rename to dom/plugins/test/crashtests/crashtests.list
rename from modules/plugin/test/mochitest/307-xo-redirect.sjs
rename to dom/plugins/test/mochitest/307-xo-redirect.sjs
--- a/modules/plugin/test/mochitest/307-xo-redirect.sjs
+++ b/dom/plugins/test/mochitest/307-xo-redirect.sjs
@@ -1,6 +1,6 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarily");
-  response.setHeader("Location", "http://example.org/tests/modules/plugin/test/loremipsum.txt");
+  response.setHeader("Location", "http://example.org/tests/dom/plugins/test/loremipsum.txt");
   response.setHeader("Content-Type", "text/html");
 }
rename from modules/plugin/test/mochitest/Makefile.in
rename to dom/plugins/test/mochitest/Makefile.in
--- a/modules/plugin/test/mochitest/Makefile.in
+++ b/dom/plugins/test/mochitest/Makefile.in
@@ -34,17 +34,17 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = modules/plugin/test
+relativesrcdir  = dom/plugins/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _MOCHITEST_FILES = \
   utils.js \
   test_getauthenticationinfo.html \
   test_npobject_getters.html \
rename from modules/plugin/test/mochitest/cocoa_focus.html
rename to dom/plugins/test/mochitest/cocoa_focus.html
rename from modules/plugin/test/mochitest/cocoa_window_focus.html
rename to dom/plugins/test/mochitest/cocoa_window_focus.html
rename from modules/plugin/test/mochitest/crashing_subpage.html
rename to dom/plugins/test/mochitest/crashing_subpage.html
rename from modules/plugin/test/mochitest/large-pic.jpg
rename to dom/plugins/test/mochitest/large-pic.jpg
rename from modules/plugin/test/mochitest/loremipsum.txt
rename to dom/plugins/test/mochitest/loremipsum.txt
rename from modules/plugin/test/mochitest/loremipsum.xtest
rename to dom/plugins/test/mochitest/loremipsum.xtest
rename from modules/plugin/test/mochitest/loremipsum.xtest^headers^
rename to dom/plugins/test/mochitest/loremipsum.xtest^headers^
rename from modules/plugin/test/mochitest/loremipsum_file.txt
rename to dom/plugins/test/mochitest/loremipsum_file.txt
rename from modules/plugin/test/mochitest/loremipsum_nocache.txt
rename to dom/plugins/test/mochitest/loremipsum_nocache.txt
rename from modules/plugin/test/mochitest/loremipsum_nocache.txt^headers^
rename to dom/plugins/test/mochitest/loremipsum_nocache.txt^headers^
rename from modules/plugin/test/mochitest/neverending.sjs
rename to dom/plugins/test/mochitest/neverending.sjs
rename from modules/plugin/test/mochitest/plugin_visibility_loader.html
rename to dom/plugins/test/mochitest/plugin_visibility_loader.html
rename from modules/plugin/test/mochitest/plugin_window.html
rename to dom/plugins/test/mochitest/plugin_window.html
rename from modules/plugin/test/mochitest/pluginstream.js
rename to dom/plugins/test/mochitest/pluginstream.js
rename from modules/plugin/test/mochitest/post.sjs
rename to dom/plugins/test/mochitest/post.sjs
rename from modules/plugin/test/mochitest/test_GCrace.html
rename to dom/plugins/test/mochitest/test_GCrace.html
rename from modules/plugin/test/mochitest/test_bug479979.xul
rename to dom/plugins/test/mochitest/test_bug479979.xul
rename from modules/plugin/test/mochitest/test_bug532208.html
rename to dom/plugins/test/mochitest/test_bug532208.html
rename from modules/plugin/test/mochitest/test_bug539565-1.html
rename to dom/plugins/test/mochitest/test_bug539565-1.html
rename from modules/plugin/test/mochitest/test_bug539565-2.html
rename to dom/plugins/test/mochitest/test_bug539565-2.html
rename from modules/plugin/test/mochitest/test_clear_site_data.html
rename to dom/plugins/test/mochitest/test_clear_site_data.html
rename from modules/plugin/test/mochitest/test_cocoa_focus.html
rename to dom/plugins/test/mochitest/test_cocoa_focus.html
rename from modules/plugin/test/mochitest/test_cocoa_window_focus.html
rename to dom/plugins/test/mochitest/test_cocoa_window_focus.html
rename from modules/plugin/test/mochitest/test_convertpoint.xul
rename to dom/plugins/test/mochitest/test_convertpoint.xul
rename from modules/plugin/test/mochitest/test_cookies.html
rename to dom/plugins/test/mochitest/test_cookies.html
rename from modules/plugin/test/mochitest/test_copyText.html
rename to dom/plugins/test/mochitest/test_copyText.html
rename from modules/plugin/test/mochitest/test_crash_nested_loop.html
rename to dom/plugins/test/mochitest/test_crash_nested_loop.html
rename from modules/plugin/test/mochitest/test_crash_notify.xul
rename to dom/plugins/test/mochitest/test_crash_notify.xul
rename from modules/plugin/test/mochitest/test_crash_notify_no_report.xul
rename to dom/plugins/test/mochitest/test_crash_notify_no_report.xul
rename from modules/plugin/test/mochitest/test_crash_submit.xul
rename to dom/plugins/test/mochitest/test_crash_submit.xul
rename from modules/plugin/test/mochitest/test_crashing.html
rename to dom/plugins/test/mochitest/test_crashing.html
rename from modules/plugin/test/mochitest/test_crashing2.html
rename to dom/plugins/test/mochitest/test_crashing2.html
rename from modules/plugin/test/mochitest/test_enumerate.html
rename to dom/plugins/test/mochitest/test_enumerate.html
rename from modules/plugin/test/mochitest/test_fullpage.html
rename to dom/plugins/test/mochitest/test_fullpage.html
rename from modules/plugin/test/mochitest/test_getauthenticationinfo.html
rename to dom/plugins/test/mochitest/test_getauthenticationinfo.html
rename from modules/plugin/test/mochitest/test_hanging.html
rename to dom/plugins/test/mochitest/test_hanging.html
rename from modules/plugin/test/mochitest/test_instantiation.html
rename to dom/plugins/test/mochitest/test_instantiation.html
rename from modules/plugin/test/mochitest/test_multipleinstanceobjects.html
rename to dom/plugins/test/mochitest/test_multipleinstanceobjects.html
rename from modules/plugin/test/mochitest/test_newstreamondestroy.html
rename to dom/plugins/test/mochitest/test_newstreamondestroy.html
rename from modules/plugin/test/mochitest/test_npn_asynccall.html
rename to dom/plugins/test/mochitest/test_npn_asynccall.html
rename from modules/plugin/test/mochitest/test_npn_timers.html
rename to dom/plugins/test/mochitest/test_npn_timers.html
rename from modules/plugin/test/mochitest/test_npobject_getters.html
rename to dom/plugins/test/mochitest/test_npobject_getters.html
rename from modules/plugin/test/mochitest/test_npruntime.xul
rename to dom/plugins/test/mochitest/test_npruntime.xul
rename from modules/plugin/test/mochitest/test_npruntime_construct.html
rename to dom/plugins/test/mochitest/test_npruntime_construct.html
rename from modules/plugin/test/mochitest/test_npruntime_identifiers.html
rename to dom/plugins/test/mochitest/test_npruntime_identifiers.html
rename from modules/plugin/test/mochitest/test_npruntime_npnevaluate.html
rename to dom/plugins/test/mochitest/test_npruntime_npnevaluate.html
rename from modules/plugin/test/mochitest/test_npruntime_npninvoke.html
rename to dom/plugins/test/mochitest/test_npruntime_npninvoke.html
rename from modules/plugin/test/mochitest/test_npruntime_npninvokedefault.html
rename to dom/plugins/test/mochitest/test_npruntime_npninvokedefault.html
rename from modules/plugin/test/mochitest/test_npruntime_npnsetexception.html
rename to dom/plugins/test/mochitest/test_npruntime_npnsetexception.html
rename from modules/plugin/test/mochitest/test_painting.html
rename to dom/plugins/test/mochitest/test_painting.html
rename from modules/plugin/test/mochitest/test_plugin_scroll_painting.html
rename to dom/plugins/test/mochitest/test_plugin_scroll_painting.html
rename from modules/plugin/test/mochitest/test_pluginstream_asfile.html
rename to dom/plugins/test/mochitest/test_pluginstream_asfile.html
rename from modules/plugin/test/mochitest/test_pluginstream_asfileonly.html
rename to dom/plugins/test/mochitest/test_pluginstream_asfileonly.html
rename from modules/plugin/test/mochitest/test_pluginstream_err.html
rename to dom/plugins/test/mochitest/test_pluginstream_err.html
rename from modules/plugin/test/mochitest/test_pluginstream_geturl.html
rename to dom/plugins/test/mochitest/test_pluginstream_geturl.html
rename from modules/plugin/test/mochitest/test_pluginstream_geturlnotify.html
rename to dom/plugins/test/mochitest/test_pluginstream_geturlnotify.html
rename from modules/plugin/test/mochitest/test_pluginstream_newstream.html
rename to dom/plugins/test/mochitest/test_pluginstream_newstream.html
rename from modules/plugin/test/mochitest/test_pluginstream_post.html
rename to dom/plugins/test/mochitest/test_pluginstream_post.html
rename from modules/plugin/test/mochitest/test_pluginstream_poststream.html
rename to dom/plugins/test/mochitest/test_pluginstream_poststream.html
rename from modules/plugin/test/mochitest/test_pluginstream_seek.html
rename to dom/plugins/test/mochitest/test_pluginstream_seek.html
rename from modules/plugin/test/mochitest/test_pluginstream_seek_close.html
rename to dom/plugins/test/mochitest/test_pluginstream_seek_close.html
rename from modules/plugin/test/mochitest/test_pluginstream_src.html
rename to dom/plugins/test/mochitest/test_pluginstream_src.html
rename from modules/plugin/test/mochitest/test_positioning.html
rename to dom/plugins/test/mochitest/test_positioning.html
rename from modules/plugin/test/mochitest/test_privatemode.xul
rename to dom/plugins/test/mochitest/test_privatemode.xul
rename from modules/plugin/test/mochitest/test_propertyAndMethod.html
rename to dom/plugins/test/mochitest/test_propertyAndMethod.html
rename from modules/plugin/test/mochitest/test_redirect_handling.html
rename to dom/plugins/test/mochitest/test_redirect_handling.html
--- a/modules/plugin/test/mochitest/test_redirect_handling.html
+++ b/dom/plugins/test/mochitest/test_redirect_handling.html
@@ -8,17 +8,17 @@
   <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 
   <script class="testbody" type="application/javascript">
     SimpleTest.waitForExplicitFinish();
 
     var p = document.getElementById("plugin1");
 
     var redirectingURL = "307-xo-redirect.sjs";
-    var redirectTargetURL = "http://example.org/tests/modules/plugin/test/loremipsum.txt";
+    var redirectTargetURL = "http://example.org/tests/dom/plugins/test/loremipsum.txt";
 
     var expectedWriteURL = "";
     var expectedNotifyStatus = -1;
 
     function redirectCallback(url, httpStatus) {
       is(url, redirectTargetURL, "Test for expected redirect notify URL.");
       is(httpStatus, 307, "Test for expected http redirect status.");
     }
rename from modules/plugin/test/mochitest/test_streamNotify.html
rename to dom/plugins/test/mochitest/test_streamNotify.html
rename from modules/plugin/test/mochitest/test_streamatclose.html
rename to dom/plugins/test/mochitest/test_streamatclose.html
rename from modules/plugin/test/mochitest/test_twostreams.html
rename to dom/plugins/test/mochitest/test_twostreams.html
rename from modules/plugin/test/mochitest/test_visibility.html
rename to dom/plugins/test/mochitest/test_visibility.html
rename from modules/plugin/test/mochitest/test_windowed_invalidate.html
rename to dom/plugins/test/mochitest/test_windowed_invalidate.html
rename from modules/plugin/test/mochitest/test_wmode.xul
rename to dom/plugins/test/mochitest/test_wmode.xul
rename from modules/plugin/test/mochitest/test_xulbrowser_plugin_visibility.xul
rename to dom/plugins/test/mochitest/test_xulbrowser_plugin_visibility.xul
rename from modules/plugin/test/mochitest/test_zero_opacity.html
rename to dom/plugins/test/mochitest/test_zero_opacity.html
rename from modules/plugin/test/mochitest/utils.js
rename to dom/plugins/test/mochitest/utils.js
rename from modules/plugin/test/mochitest/xulbrowser_plugin_visibility.xul
rename to dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
--- a/modules/plugin/test/mochitest/xulbrowser_plugin_visibility.xul
+++ b/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
@@ -19,17 +19,17 @@
     const ok = window.opener.wrappedJSObject.ok;
     const is = window.opener.wrappedJSObject.is;
     const done = window.opener.wrappedJSObject.done;
     const SimpleTest = window.opener.wrappedJSObject.SimpleTest;
 
     const nsIWebProgress = Components.interfaces.nsIWebProgress;
     const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
 
-    const kURI = 'http://mochi.test:8888/chrome/modules/plugin/test/plugin_visibility_loader.html';
+    const kURI = 'http://mochi.test:8888/chrome/dom/plugins/test/plugin_visibility_loader.html';
 
     function ProgressListener() {
     }
     ProgressListener.prototype.onStateChange =
       function(progress, req, flags, status) {
         if ((flags & nsIWebProgressListener.STATE_IS_WINDOW) &&
             (flags & nsIWebProgressListener.STATE_STOP))
           browserLoaded();
rename from modules/plugin/test/reftest/border-padding-1-ref.html
rename to dom/plugins/test/reftest/border-padding-1-ref.html
rename from modules/plugin/test/reftest/border-padding-1.html
rename to dom/plugins/test/reftest/border-padding-1.html
rename from modules/plugin/test/reftest/border-padding-2-ref.html
rename to dom/plugins/test/reftest/border-padding-2-ref.html
rename from modules/plugin/test/reftest/border-padding-2.html
rename to dom/plugins/test/reftest/border-padding-2.html
rename from modules/plugin/test/reftest/border-padding-3-ref.html
rename to dom/plugins/test/reftest/border-padding-3-ref.html
rename from modules/plugin/test/reftest/border-padding-3.html
rename to dom/plugins/test/reftest/border-padding-3.html
rename from modules/plugin/test/reftest/div-alpha-opacity.html
rename to dom/plugins/test/reftest/div-alpha-opacity.html
rename from modules/plugin/test/reftest/div-alpha-zindex.html
rename to dom/plugins/test/reftest/div-alpha-zindex.html
rename from modules/plugin/test/reftest/div-sanity.html
rename to dom/plugins/test/reftest/div-sanity.html
rename from modules/plugin/test/reftest/plugin-alpha-opacity.html
rename to dom/plugins/test/reftest/plugin-alpha-opacity.html
rename from modules/plugin/test/reftest/plugin-alpha-zindex.html
rename to dom/plugins/test/reftest/plugin-alpha-zindex.html
rename from modules/plugin/test/reftest/plugin-background-1-step.html
rename to dom/plugins/test/reftest/plugin-background-1-step.html
rename from modules/plugin/test/reftest/plugin-background-10-step.html
rename to dom/plugins/test/reftest/plugin-background-10-step.html
rename from modules/plugin/test/reftest/plugin-background-2-step.html
rename to dom/plugins/test/reftest/plugin-background-2-step.html
rename from modules/plugin/test/reftest/plugin-background-5-step.html
rename to dom/plugins/test/reftest/plugin-background-5-step.html
rename from modules/plugin/test/reftest/plugin-background-ref.html
rename to dom/plugins/test/reftest/plugin-background-ref.html
rename from modules/plugin/test/reftest/plugin-background.css
rename to dom/plugins/test/reftest/plugin-background.css
rename from modules/plugin/test/reftest/plugin-background.html
rename to dom/plugins/test/reftest/plugin-background.html
rename from modules/plugin/test/reftest/plugin-background.js
rename to dom/plugins/test/reftest/plugin-background.js
rename from modules/plugin/test/reftest/plugin-busy-alpha-zindex.html
rename to dom/plugins/test/reftest/plugin-busy-alpha-zindex.html
rename from modules/plugin/test/reftest/plugin-canvas-alpha-zindex.html
rename to dom/plugins/test/reftest/plugin-canvas-alpha-zindex.html
rename from modules/plugin/test/reftest/plugin-sanity.html
rename to dom/plugins/test/reftest/plugin-sanity.html
rename from modules/plugin/test/reftest/plugin-transform-1-ref.html
rename to dom/plugins/test/reftest/plugin-transform-1-ref.html
rename from modules/plugin/test/reftest/plugin-transform-1.html
rename to dom/plugins/test/reftest/plugin-transform-1.html
rename from modules/plugin/test/reftest/plugin-transform-2-ref.html
rename to dom/plugins/test/reftest/plugin-transform-2-ref.html
rename from modules/plugin/test/reftest/plugin-transform-2.html
rename to dom/plugins/test/reftest/plugin-transform-2.html
rename from modules/plugin/test/reftest/plugin-transform-alpha-zindex.html
rename to dom/plugins/test/reftest/plugin-transform-alpha-zindex.html
rename from modules/plugin/test/reftest/pluginproblemui-direction-1-ref.html
rename to dom/plugins/test/reftest/pluginproblemui-direction-1-ref.html
rename from modules/plugin/test/reftest/pluginproblemui-direction-1.html
rename to dom/plugins/test/reftest/pluginproblemui-direction-1.html
rename from modules/plugin/test/reftest/pluginproblemui-direction-2-ref.html
rename to dom/plugins/test/reftest/pluginproblemui-direction-2-ref.html
rename from modules/plugin/test/reftest/pluginproblemui-direction-2.html
rename to dom/plugins/test/reftest/pluginproblemui-direction-2.html
rename from modules/plugin/test/reftest/reftest.list
rename to dom/plugins/test/reftest/reftest.list
rename from modules/plugin/test/reftest/windowless-clipping-1-ref.html
rename to dom/plugins/test/reftest/windowless-clipping-1-ref.html
rename from modules/plugin/test/reftest/windowless-clipping-1.html
rename to dom/plugins/test/reftest/windowless-clipping-1.html
rename from modules/plugin/test/testplugin/Info.plist
rename to dom/plugins/test/testplugin/Info.plist
rename from modules/plugin/test/testplugin/Makefile.in
rename to dom/plugins/test/testplugin/Makefile.in
rename from modules/plugin/test/testplugin/README
rename to dom/plugins/test/testplugin/README
rename from modules/plugin/test/testplugin/nptest.cpp
rename to dom/plugins/test/testplugin/nptest.cpp
rename from modules/plugin/test/testplugin/nptest.def
rename to dom/plugins/test/testplugin/nptest.def
rename from modules/plugin/test/testplugin/nptest.h
rename to dom/plugins/test/testplugin/nptest.h
rename from modules/plugin/test/testplugin/nptest.rc
rename to dom/plugins/test/testplugin/nptest.rc
rename from modules/plugin/test/testplugin/nptest_droid.cpp
rename to dom/plugins/test/testplugin/nptest_droid.cpp
rename from modules/plugin/test/testplugin/nptest_gtk2.cpp
rename to dom/plugins/test/testplugin/nptest_gtk2.cpp
rename from modules/plugin/test/testplugin/nptest_macosx.mm
rename to dom/plugins/test/testplugin/nptest_macosx.mm
rename from modules/plugin/test/testplugin/nptest_os2.cpp
rename to dom/plugins/test/testplugin/nptest_os2.cpp
rename from modules/plugin/test/testplugin/nptest_platform.h
rename to dom/plugins/test/testplugin/nptest_platform.h
rename from modules/plugin/test/testplugin/nptest_qt.cpp
rename to dom/plugins/test/testplugin/nptest_qt.cpp
rename from modules/plugin/test/testplugin/nptest_utils.cpp
rename to dom/plugins/test/testplugin/nptest_utils.cpp
rename from modules/plugin/test/testplugin/nptest_utils.h
rename to dom/plugins/test/testplugin/nptest_utils.h
rename from modules/plugin/test/testplugin/nptest_windows.cpp
rename to dom/plugins/test/testplugin/nptest_windows.cpp
rename from modules/plugin/test/unit/head_plugins.js
rename to dom/plugins/test/unit/head_plugins.js
rename from modules/plugin/test/unit/test_bug455213.js
rename to dom/plugins/test/unit/test_bug455213.js
rename from modules/plugin/test/unit/test_bug471245.js
rename to dom/plugins/test/unit/test_bug471245.js
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -208,17 +208,17 @@ include ../../parser/htmlparser/tests/re
 
 # percent-overflow-sizing/
 include percent-overflow-sizing/reftest.list
 
 # pixel-rounding/
 include pixel-rounding/reftest.list
 
 # plugin/
-include ../../modules/plugin/test/reftest/reftest.list
+include ../../dom/plugins/test/reftest/reftest.list
 
 # printing
 include printing/reftest.list
 include pagination/reftest.list
 
 # scrolling
 include scrolling/reftest.list
 
deleted file mode 100644
--- a/modules/plugin/Makefile.in
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH = ../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = plugin
-
-# These subdirs rely on GTK libraries and header files, it is not
-#  buildable on other non-GTK unix builds
-
-ifdef ENABLE_TESTS
-ifneq (,$(filter gtk2 cocoa windows android qt os2,$(MOZ_WIDGET_TOOLKIT)))
-DIRS += test
-endif
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-$(DIST)/bin/plugins:
-	$(NSINSTALL) -D $@
-
-export:: $(DIST)/bin/plugins
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -42,17 +42,17 @@ include ../../layout/svg/crashtests/cras
 include ../../layout/tables/crashtests/crashtests.list
 include ../../layout/xul/base/src/crashtests/crashtests.list
 include ../../layout/xul/base/src/grid/crashtests/crashtests.list
 include ../../layout/xul/base/src/tree/src/crashtests/crashtests.list
 
 include ../../gfx/tests/crashtests/crashtests.list
 
 include ../../modules/libpr0n/test/crashtests/crashtests.list
-include ../../modules/plugin/test/crashtests/crashtests.list
+include ../../dom/plugins/test/crashtests/crashtests.list
 
 include ../../parser/htmlparser/tests/crashtests/crashtests.list
 
 include ../../security/manager/ssl/crashtests/crashtests.list
 
 include ../../view/crashtests/crashtests.list
 
 include ../../widget/src/cocoa/crashtests/crashtests.list
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -433,17 +433,17 @@ class Mochitest(object):
     """ Build the url path to the specific test harness and test file or directory """
     testHost = "http://mochi.test:8888"
     testURL = testHost + self.TEST_PATH + options.testPath
     if options.chrome or options.a11y:
        testURL = testHost + self.CHROME_PATH
     elif options.browserChrome:
       testURL = "about:blank"
     elif options.ipcplugins:
-      testURL = testHost + self.TEST_PATH + "modules/plugin/test"
+      testURL = testHost + self.TEST_PATH + "dom/plugins/test"
     return testURL
 
   def startWebSocketServer(self, options, debuggerInfo):
     """ Launch the websocket server """
     if options.webServer != '127.0.0.1':
       return
 
     self.wsserver = WebSocketServer(self.automation, options,
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -90,26 +90,26 @@ mochitest-chrome:
 
 mochitest-a11y:
 	$(RUN_MOCHITEST) --a11y
 	$(CHECK_TEST_ERROR)
 
 mochitest-ipcplugins:
 ifeq (Darwin,$(OS_ARCH))
 ifeq (i386,$(TARGET_CPU))
-	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.i386.test.plugin=false --test-path=modules/plugin/test
+	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.i386.test.plugin=false --test-path=dom/plugins/test
 endif
 ifeq (x86_64,$(TARGET_CPU))
-	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.x86_64.test.plugin=false --test-path=modules/plugin/test
+	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.x86_64.test.plugin=false --test-path=dom/plugins/test
 endif
 ifeq (powerpc,$(TARGET_CPU))
-	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.ppc.test.plugin=false --test-path=modules/plugin/test
+	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.ppc.test.plugin=false --test-path=dom/plugins/test
 endif
 else
-	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled=false --test-path=modules/plugin/test
+	$(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled=false --test-path=dom/plugins/test
 endif
 	$(CHECK_TEST_ERROR)
 
 # Usage: |make [EXTRA_TEST_ARGS=...] *test|.
 RUN_REFTEST = rm -f ./$@.log && $(PYTHON) _tests/reftest/runreftest.py \
   $(SYMBOLS_PATH) $(EXTRA_TEST_ARGS) $(1) | tee ./$@.log
 
 ifeq ($(OS_ARCH),WINNT) #{
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -80,16 +80,19 @@ MAKEFILES_dom="
   dom/src/geolocation/Makefile
   dom/src/json/Makefile
   dom/src/offline/Makefile
   dom/src/storage/Makefile
   dom/src/threads/Makefile
   dom/locales/Makefile
   dom/plugins/base/Makefile
   dom/plugins/ipc/Makefile
+  dom/plugins/test/Makefile
+  dom/plugins/test/mochitest/Makefile
+  dom/plugins/test/testplugin/Makefile
   js/jetpack/Makefile
 "
 
 MAKEFILES_editor="
   editor/Makefile
   editor/public/Makefile
   editor/idl/Makefile
   editor/txmgr/Makefile
@@ -349,20 +352,16 @@ MAKEFILES_libsydneyaudio="
 "
 
 MAKEFILES_libnestegg="
   media/libnestegg/Makefile
   media/libnestegg/include/Makefile
   media/libnestegg/src/Makefile
 "
 
-MAKEFILES_plugin="
-  modules/plugin/Makefile
-"
-
 MAKEFILES_netwerk="
   netwerk/Makefile
   netwerk/base/Makefile
   netwerk/base/public/Makefile
   netwerk/base/src/Makefile
   netwerk/build/Makefile
   netwerk/cache/Makefile
   netwerk/cookie/Makefile
@@ -862,19 +861,16 @@ if [ "$ENABLE_TESTS" ]; then
     layout/tools/reftest/Makefile
     layout/xul/base/test/Makefile
     layout/xul/test/Makefile
     modules/libjar/test/chrome/Makefile
     modules/libjar/test/mochitest/Makefile
     modules/libpr0n/test/Makefile
     modules/libpr0n/test/mochitest/Makefile
     modules/libpref/test/Makefile
-    modules/plugin/test/Makefile
-    modules/plugin/test/mochitest/Makefile
-    modules/plugin/test/testplugin/Makefile
     netwerk/test/httpserver/Makefile
     parser/htmlparser/tests/mochitest/Makefile
     parser/xml/test/Makefile
     rdf/tests/triplescat/Makefile
     startupcache/test/Makefile
     testing/mochitest/Makefile
     testing/mochitest/MochiKit/Makefile
     testing/mochitest/chrome/Makefile
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -167,17 +167,16 @@ endif
 
 tier_platform_dirs	+= \
 		uriloader \
 		modules/libimg \
 		caps \
 		parser \
 		gfx \
 		modules/libpr0n \
-		modules/plugin \
 		dom \
 		view \
 		widget \
 		content \
 		editor \
 		layout \
 		docshell \
 		embedding \