Bug 649558 - Move modules/plugin/base to dom/plugins/base, r=josh

--HG--
rename : modules/plugin/base/src/Makefile.in => dom/plugins/base/Makefile.in
rename : modules/plugin/base/src/PluginPRLibrary.cpp => dom/plugins/base/PluginPRLibrary.cpp
rename : modules/plugin/base/src/PluginPRLibrary.h => dom/plugins/base/PluginPRLibrary.h
rename : modules/plugin/base/public/npapi.h => dom/plugins/base/npapi.h
rename : modules/plugin/base/public/npfunctions.h => dom/plugins/base/npfunctions.h
rename : modules/plugin/base/public/npruntime.h => dom/plugins/base/npruntime.h
rename : modules/plugin/base/public/nptypes.h => dom/plugins/base/nptypes.h
rename : modules/plugin/base/public/nsIHTTPHeaderListener.idl => dom/plugins/base/nsIHTTPHeaderListener.idl
rename : modules/plugin/base/public/nsIPlugin.idl => dom/plugins/base/nsIPlugin.idl
rename : modules/plugin/base/public/nsIPluginDocument.idl => dom/plugins/base/nsIPluginDocument.idl
rename : modules/plugin/base/public/nsIPluginHost.idl => dom/plugins/base/nsIPluginHost.idl
rename : modules/plugin/base/public/nsIPluginInputStream.idl => dom/plugins/base/nsIPluginInputStream.idl
rename : modules/plugin/base/public/nsIPluginInstance.idl => dom/plugins/base/nsIPluginInstance.idl
rename : modules/plugin/base/public/nsIPluginInstanceOwner.idl => dom/plugins/base/nsIPluginInstanceOwner.idl
rename : modules/plugin/base/public/nsIPluginStreamInfo.idl => dom/plugins/base/nsIPluginStreamInfo.idl
rename : modules/plugin/base/public/nsIPluginStreamListener.idl => dom/plugins/base/nsIPluginStreamListener.idl
rename : modules/plugin/base/public/nsIPluginTag.idl => dom/plugins/base/nsIPluginTag.idl
rename : modules/plugin/base/public/nsIPluginTagInfo.idl => dom/plugins/base/nsIPluginTagInfo.idl
rename : modules/plugin/base/src/nsJSNPRuntime.cpp => dom/plugins/base/nsJSNPRuntime.cpp
rename : modules/plugin/base/src/nsJSNPRuntime.h => dom/plugins/base/nsJSNPRuntime.h
rename : modules/plugin/base/src/nsNPAPIPlugin.cpp => dom/plugins/base/nsNPAPIPlugin.cpp
rename : modules/plugin/base/src/nsNPAPIPlugin.h => dom/plugins/base/nsNPAPIPlugin.h
rename : modules/plugin/base/src/nsNPAPIPluginInstance.cpp => dom/plugins/base/nsNPAPIPluginInstance.cpp
rename : modules/plugin/base/src/nsNPAPIPluginInstance.h => dom/plugins/base/nsNPAPIPluginInstance.h
rename : modules/plugin/base/src/nsNPAPIPluginStreamListener.cpp => dom/plugins/base/nsNPAPIPluginStreamListener.cpp
rename : modules/plugin/base/src/nsNPAPIPluginStreamListener.h => dom/plugins/base/nsNPAPIPluginStreamListener.h
rename : modules/plugin/base/src/nsPluginDirServiceProvider.cpp => dom/plugins/base/nsPluginDirServiceProvider.cpp
rename : modules/plugin/base/src/nsPluginDirServiceProvider.h => dom/plugins/base/nsPluginDirServiceProvider.h
rename : modules/plugin/base/public/nsPluginError.h => dom/plugins/base/nsPluginError.h
rename : modules/plugin/base/src/nsPluginHost.cpp => dom/plugins/base/nsPluginHost.cpp
rename : modules/plugin/base/src/nsPluginHost.h => dom/plugins/base/nsPluginHost.h
rename : modules/plugin/base/public/nsPluginLogging.h => dom/plugins/base/nsPluginLogging.h
rename : modules/plugin/base/src/nsPluginManifestLineReader.h => dom/plugins/base/nsPluginManifestLineReader.h
rename : modules/plugin/base/src/nsPluginModule.cpp => dom/plugins/base/nsPluginModule.cpp
rename : modules/plugin/base/src/nsPluginNativeWindow.cpp => dom/plugins/base/nsPluginNativeWindow.cpp
rename : modules/plugin/base/public/nsPluginNativeWindow.h => dom/plugins/base/nsPluginNativeWindow.h
rename : modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp => dom/plugins/base/nsPluginNativeWindowGtk2.cpp
rename : modules/plugin/base/src/nsPluginNativeWindowOS2.cpp => dom/plugins/base/nsPluginNativeWindowOS2.cpp
rename : modules/plugin/base/src/nsPluginNativeWindowQt.cpp => dom/plugins/base/nsPluginNativeWindowQt.cpp
rename : modules/plugin/base/src/nsPluginNativeWindowWin.cpp => dom/plugins/base/nsPluginNativeWindowWin.cpp
rename : modules/plugin/base/src/nsPluginSafety.h => dom/plugins/base/nsPluginSafety.h
rename : modules/plugin/base/src/nsPluginStreamListenerPeer.cpp => dom/plugins/base/nsPluginStreamListenerPeer.cpp
rename : modules/plugin/base/src/nsPluginStreamListenerPeer.h => dom/plugins/base/nsPluginStreamListenerPeer.h
rename : modules/plugin/base/src/nsPluginTags.cpp => dom/plugins/base/nsPluginTags.cpp
rename : modules/plugin/base/src/nsPluginTags.h => dom/plugins/base/nsPluginTags.h
rename : modules/plugin/base/public/nsPluginsCID.h => dom/plugins/base/nsPluginsCID.h
rename : modules/plugin/base/src/nsPluginsDir.h => dom/plugins/base/nsPluginsDir.h
rename : modules/plugin/base/src/nsPluginsDirDarwin.cpp => dom/plugins/base/nsPluginsDirDarwin.cpp
rename : modules/plugin/base/src/nsPluginsDirOS2.cpp => dom/plugins/base/nsPluginsDirOS2.cpp
rename : modules/plugin/base/src/nsPluginsDirUnix.cpp => dom/plugins/base/nsPluginsDirUnix.cpp
rename : modules/plugin/base/src/nsPluginsDirUtils.h => dom/plugins/base/nsPluginsDirUtils.h
rename : modules/plugin/base/src/nsPluginsDirWin.cpp => dom/plugins/base/nsPluginsDirWin.cpp
rename : modules/plugin/base/public/nspluginroot.idl => dom/plugins/base/nspluginroot.idl

dom/Makefile.in

@@ -80,6 +80,7 @@ DIRS += \
   base \
   src \
   locales \
+  plugins/base \
   plugins/ipc \
   indexedDB \
   system \

dom/plugins/base/Makefile.in

@@ -35,7 +35,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
@@ -43,7 +43,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= plugin
-XPIDL_MODULE	= layout
 LIBRARY_NAME	= gkplugin
 EXPORT_LIBRARY = 1
 IS_COMPONENT    = 1
@@ -53,6 +52,32 @@ LIBXUL_LIBRARY = 1
 
 EXPORTS_NAMESPACES = mozilla
 
+XPIDLSRCS = \
+  nsIHTTPHeaderListener.idl \
+  nsIPlugin.idl \
+  nsIPluginDocument.idl \
+  nsIPluginHost.idl \
+  nsIPluginInputStream.idl \
+  nsIPluginInstance.idl \
+  nsIPluginInstanceOwner.idl \
+  nsIPluginStreamInfo.idl \
+  nsIPluginStreamListener.idl \
+  nsIPluginTag.idl \
+  nsIPluginTagInfo.idl \
+  nspluginroot.idl \
+  $(NULL)
+
+EXPORTS = \
+  npapi.h \
+  npfunctions.h \
+  nptypes.h \
+  npruntime.h \
+  nsPluginLogging.h \
+  nsPluginError.h \
+  nsPluginNativeWindow.h \
+  nsPluginsCID.h \
+  $(NULL)
+
 EXPORTS_mozilla = \
   PluginPRLibrary.h \
   $(NULL)

dom/plugins/ipc/Makefile.in

@@ -142,8 +142,7 @@ CMMSRCS   += \
 endif
 
 LOCAL_INCLUDES = \
-  -I$(topsrcdir)/modules/plugin/base/public/ \
-  -I$(topsrcdir)/modules/plugin/base/src/ \
+  -I$(srcdir)/../base \
   -I$(topsrcdir)/xpcom/base/ \
   $(NULL)
 

layout/generic/Makefile.in

@@ -159,7 +159,7 @@ LOCAL_INCLUDES += \
 		-I$(srcdir)/../../content/base/src \
 		-I$(srcdir)/../../content/html/content/src \
 		-I$(srcdir)/../../dom/base \
-		-I$(srcdir)/../../modules/plugin/base/src \
+		-I$(srcdir)/../../dom/plugins/base \
 		$(MOZ_CAIRO_CFLAGS) \
 		$(NULL)
 

modules/plugin/Makefile.in

@@ -44,11 +44,6 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = plugin
 
-DIRS = \
-  base/public \
-  base/src \
-  $(NULL)
-
 # These subdirs rely on GTK libraries and header files, it is not
 #  buildable on other non-GTK unix builds
 

modules/plugin/base/public/Makefile.in

@@ -1,77 +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
-GRE_MODULE = 1
-
-EXPORTS = \
-  nsPluginLogging.h \
-  nsPluginError.h \
-  nsPluginNativeWindow.h \
-  nsPluginsCID.h \
-  $(NULL)
-
-SDK_HEADERS = \
-  npapi.h \
-  npfunctions.h \
-  nptypes.h \
-  npruntime.h \
-  $(NULL)
-
-XPIDLSRCS = \
-  nsIHTTPHeaderListener.idl \
-  nsIPlugin.idl \
-  nsIPluginDocument.idl \
-  nsIPluginHost.idl \
-  nsIPluginInputStream.idl \
-  nsIPluginInstance.idl \
-  nsIPluginInstanceOwner.idl \
-  nsIPluginStreamInfo.idl \
-  nsIPluginStreamListener.idl \
-  nsIPluginTag.idl \
-  nsIPluginTagInfo.idl \
-  nspluginroot.idl \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk

toolkit/toolkit-makefiles.sh

@@ -84,6 +84,7 @@ MAKEFILES_dom="
   dom/src/storage/Makefile
   dom/src/threads/Makefile
   dom/locales/Makefile
+  dom/plugins/base/Makefile
   dom/plugins/ipc/Makefile
   js/jetpack/Makefile
 "
@@ -355,8 +356,6 @@ MAKEFILES_libnestegg="
 
 MAKEFILES_plugin="
   modules/plugin/Makefile
-  modules/plugin/base/src/Makefile
-  modules/plugin/base/public/Makefile
 "
 
 MAKEFILES_netwerk="