Implement NPN_GetValueForURL and NPN_SetValueForURL and add a stub for NPN_GetAuthenticationInfo. With these NPAPI functions there's no need to simulate being in Firefox and implement NPN_GetValue for NPNVserviceManager.

TEST=run manual test that Ken added in test\data\plugin over http
Review URL: http://codereview.chromium.org/251101

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28200 0039d316-1c4b-4281-b951-d872f2087c98

18 files changed, 1 insertions, 4084 deletions

diff --git a/third_party/mozilla/include/nsError.h b/third_party/mozilla/include/nsError.h
deleted file mode 100644
index f957bdc..0000000
--- a/third_party/mozilla/include/nsError.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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 of 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 ***** */
-
-#ifndef nsError_h__
-#define nsError_h__
-
-#ifndef nscore_h___
-#include "nscore.h"  /* needed for nsresult */
-#endif
-
-/*
- * To add error code to your module, you need to do the following:
- *
- * 1) Add a module offset code.  Add yours to the bottom of the list 
- *    right below this comment, adding 1.
- *
- * 2) In your module, define a header file which uses one of the
- *    NE_ERROR_GENERATExxxxxx macros.  Some examples below:
- *
- *    #define NS_ERROR_MYMODULE_MYERROR1 NS_ERROR_GENERATE(NS_ERROR_SEVERITY_ERROR,NS_ERROR_MODULE_MYMODULE,1)
- *    #define NS_ERROR_MYMODULE_MYERROR2 NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_MYMODULE,2)
- *    #define NS_ERROR_MYMODULE_MYERROR3 NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_MYMODULE,3)
- *
- */
-
-
-/**
- * @name Standard Module Offset Code. Each Module should identify a unique number
- *       and then all errors associated with that module become offsets from the
- *       base associated with that module id. There are 16 bits of code bits for
- *       each module.
- */
-
-#define NS_ERROR_MODULE_XPCOM      1
-#define NS_ERROR_MODULE_BASE       2
-#define NS_ERROR_MODULE_GFX        3
-#define NS_ERROR_MODULE_WIDGET     4
-#define NS_ERROR_MODULE_CALENDAR   5
-#define NS_ERROR_MODULE_NETWORK    6
-#define NS_ERROR_MODULE_PLUGINS    7
-#define NS_ERROR_MODULE_LAYOUT     8
-#define NS_ERROR_MODULE_HTMLPARSER 9
-#define NS_ERROR_MODULE_RDF        10
-#define NS_ERROR_MODULE_UCONV      11
-#define NS_ERROR_MODULE_REG        12
-#define NS_ERROR_MODULE_FILES      13
-#define NS_ERROR_MODULE_DOM        14
-#define NS_ERROR_MODULE_IMGLIB     15
-#define NS_ERROR_MODULE_MAILNEWS   16
-#define NS_ERROR_MODULE_EDITOR     17
-#define NS_ERROR_MODULE_XPCONNECT  18
-#define NS_ERROR_MODULE_PROFILE    19
-#define NS_ERROR_MODULE_LDAP       20
-#define NS_ERROR_MODULE_SECURITY   21
-#define NS_ERROR_MODULE_DOM_XPATH  22
-#define NS_ERROR_MODULE_DOM_RANGE  23
-#define NS_ERROR_MODULE_URILOADER  24
-#define NS_ERROR_MODULE_CONTENT    25
-#define NS_ERROR_MODULE_PYXPCOM    26
-#define NS_ERROR_MODULE_XSLT       27
-#define NS_ERROR_MODULE_IPC        28
-#define NS_ERROR_MODULE_SVG        29
-#define NS_ERROR_MODULE_STORAGE    30
-#define NS_ERROR_MODULE_SCHEMA     31
-
-/* NS_ERROR_MODULE_GENERAL should be used by modules that do not
- * care if return code values overlap. Callers of methods that
- * return such codes should be aware that they are not
- * globally unique. Implementors should be careful about blindly
- * returning codes from other modules that might also use
- * the generic base.
- */
-#define NS_ERROR_MODULE_GENERAL    51  
-
-/**
- * @name Standard Error Handling Macros
- */
-
-#define NS_FAILED(_nsresult) (NS_UNLIKELY((_nsresult) & 0x80000000))
-#define NS_SUCCEEDED(_nsresult) (NS_LIKELY(!((_nsresult) & 0x80000000)))
-
-/**
- * @name Severity Code.  This flag identifies the level of warning
- */
-
-#define NS_ERROR_SEVERITY_SUCCESS       0
-#define NS_ERROR_SEVERITY_ERROR         1
-
-/**
- * @name Mozilla Code.  This flag separates consumers of mozilla code
- *       from the native platform
- */
-
-#define NS_ERROR_MODULE_BASE_OFFSET 0x45
-
-/**
- * @name Standard Error Generating Macros
- */
-
-#define NS_ERROR_GENERATE(sev,module,code) \
-    ((nsresult) (((PRUint32)(sev)<<31) | ((PRUint32)(module+NS_ERROR_MODULE_BASE_OFFSET)<<16) | ((PRUint32)(code))) )
-
-#define NS_ERROR_GENERATE_SUCCESS(module,code) \
-    ((nsresult) (((PRUint32)(NS_ERROR_SEVERITY_SUCCESS)<<31) | ((PRUint32)(module+NS_ERROR_MODULE_BASE_OFFSET)<<16) | ((PRUint32)(code))) )
-
-#define NS_ERROR_GENERATE_FAILURE(module,code) \
-    ((nsresult) (((PRUint32)(NS_ERROR_SEVERITY_ERROR)<<31) | ((PRUint32)(module+NS_ERROR_MODULE_BASE_OFFSET)<<16) | ((PRUint32)(code))) )
-
-/**
- * @name Standard Macros for retrieving error bits
- */
-
-#define NS_ERROR_GET_CODE(err)     ((err) & 0xffff)
-#define NS_ERROR_GET_MODULE(err)   (((((err) >> 16) - NS_ERROR_MODULE_BASE_OFFSET) & 0x1fff))
-#define NS_ERROR_GET_SEVERITY(err) (((err) >> 31) & 0x1)
-
-/**
- * @name Standard return values
- */
-
-/*@{*/
-
-/* Standard "it worked" return value */
-#define NS_OK                              0
-
-#define NS_ERROR_BASE                      ((nsresult) 0xC1F30000)
-
-/* Returned when an instance is not initialized */
-#define NS_ERROR_NOT_INITIALIZED           (NS_ERROR_BASE + 1)
-
-/* Returned when an instance is already initialized */
-#define NS_ERROR_ALREADY_INITIALIZED       (NS_ERROR_BASE + 2)
-
-/* Returned by a not implemented function */
-#define NS_ERROR_NOT_IMPLEMENTED           ((nsresult) 0x80004001L)
-
-/* Returned when a given interface is not supported. */
-#define NS_NOINTERFACE                     ((nsresult) 0x80004002L)
-#define NS_ERROR_NO_INTERFACE              NS_NOINTERFACE
-
-#define NS_ERROR_INVALID_POINTER           ((nsresult) 0x80004003L)
-#define NS_ERROR_NULL_POINTER              NS_ERROR_INVALID_POINTER
-
-/* Returned when a function aborts */
-#define NS_ERROR_ABORT                     ((nsresult) 0x80004004L)
-
-/* Returned when a function fails */
-#define NS_ERROR_FAILURE                   ((nsresult) 0x80004005L)
-
-/* Returned when an unexpected error occurs */
-#define NS_ERROR_UNEXPECTED                ((nsresult) 0x8000ffffL)
-
-/* Returned when a memory allocation fails */
-#define NS_ERROR_OUT_OF_MEMORY             ((nsresult) 0x8007000eL)
-
-/* Returned when an illegal value is passed */
-#define NS_ERROR_ILLEGAL_VALUE             ((nsresult) 0x80070057L)
-#define NS_ERROR_INVALID_ARG               NS_ERROR_ILLEGAL_VALUE
-
-/* Returned when a class doesn't allow aggregation */
-#define NS_ERROR_NO_AGGREGATION            ((nsresult) 0x80040110L)
-
-/* Returned when an operation can't complete due to an unavailable resource */
-#define NS_ERROR_NOT_AVAILABLE             ((nsresult) 0x80040111L)
-
-/* Returned when a class is not registered */
-#define NS_ERROR_FACTORY_NOT_REGISTERED    ((nsresult) 0x80040154L)
-
-/* Returned when a class cannot be registered, but may be tried again later */
-#define NS_ERROR_FACTORY_REGISTER_AGAIN    ((nsresult) 0x80040155L)
-
-/* Returned when a dynamically loaded factory couldn't be found */
-#define NS_ERROR_FACTORY_NOT_LOADED        ((nsresult) 0x800401f8L)
-
-/* Returned when a factory doesn't support signatures */
-#define NS_ERROR_FACTORY_NO_SIGNATURE_SUPPORT \
-                                           (NS_ERROR_BASE + 0x101)
-
-/* Returned when a factory already is registered */
-#define NS_ERROR_FACTORY_EXISTS            (NS_ERROR_BASE + 0x100)
-
-
-/* For COM compatibility reasons, we want to use exact error code numbers
-   for NS_ERROR_PROXY_INVALID_IN_PARAMETER and NS_ERROR_PROXY_INVALID_OUT_PARAMETER.
-   The first matches:
-
-     #define RPC_E_INVALID_PARAMETER          _HRESULT_TYPEDEF_(0x80010010L)
-   
-   Errors returning this mean that the xpcom proxy code could not create a proxy for
-   one of the in paramaters.
-
-   Because of this, we are ignoring the convention if using a base and offset for
-   error numbers.
-
-*/
-
-/* Returned when a proxy could not be create a proxy for one of the IN parameters
-   This is returned only when the "real" meathod has NOT been invoked. 
-*/
-
-#define NS_ERROR_PROXY_INVALID_IN_PARAMETER        ((nsresult) 0x80010010L)
-
-/* Returned when a proxy could not be create a proxy for one of the OUT parameters
-   This is returned only when the "real" meathod has ALREADY been invoked. 
-*/
-
-#define NS_ERROR_PROXY_INVALID_OUT_PARAMETER        ((nsresult) 0x80010011L)
-
-
-/*@}*/
-
- /* I/O Errors */
-
- /*  Stream closed */
-#define NS_BASE_STREAM_CLOSED         NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 2)
- /*  Error from the operating system */
-#define NS_BASE_STREAM_OSERROR        NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 3)
- /*  Illegal arguments */
-#define NS_BASE_STREAM_ILLEGAL_ARGS   NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 4)
- /*  For unichar streams */
-#define NS_BASE_STREAM_NO_CONVERTER   NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 5)
- /*  For unichar streams */
-#define NS_BASE_STREAM_BAD_CONVERSION NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 6)
-
-#define NS_BASE_STREAM_WOULD_BLOCK    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 7)
-
-
-#define NS_ERROR_FILE_UNRECOGNIZED_PATH         NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 1)
-#define NS_ERROR_FILE_UNRESOLVABLE_SYMLINK      NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 2)
-#define NS_ERROR_FILE_EXECUTION_FAILED          NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 3)
-#define NS_ERROR_FILE_UNKNOWN_TYPE              NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 4)
-#define NS_ERROR_FILE_DESTINATION_NOT_DIR       NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 5)
-#define NS_ERROR_FILE_TARGET_DOES_NOT_EXIST     NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 6)
-#define NS_ERROR_FILE_COPY_OR_MOVE_FAILED       NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 7)
-#define NS_ERROR_FILE_ALREADY_EXISTS            NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 8)
-#define NS_ERROR_FILE_INVALID_PATH              NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 9)
-#define NS_ERROR_FILE_DISK_FULL                 NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 10)
-#define NS_ERROR_FILE_CORRUPTED                 NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 11)
-#define NS_ERROR_FILE_NOT_DIRECTORY             NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 12)
-#define NS_ERROR_FILE_IS_DIRECTORY              NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 13)
-#define NS_ERROR_FILE_IS_LOCKED                 NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 14)
-#define NS_ERROR_FILE_TOO_BIG                   NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 15)
-#define NS_ERROR_FILE_NO_DEVICE_SPACE           NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 16)
-#define NS_ERROR_FILE_NAME_TOO_LONG             NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 17)
-#define NS_ERROR_FILE_NOT_FOUND                 NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 18)
-#define NS_ERROR_FILE_READ_ONLY                 NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 19)
-#define NS_ERROR_FILE_DIR_NOT_EMPTY             NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 20)
-#define NS_ERROR_FILE_ACCESS_DENIED             NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 21)
-
-#define NS_SUCCESS_FILE_DIRECTORY_EMPTY         NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_FILES, 1)
-
- /* Result codes used by nsIDirectoryServiceProvider2 */
-
-#define NS_SUCCESS_AGGREGATE_RESULT             NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_FILES, 2)
-
- /* Result codes used by nsIVariant */
-
-#define NS_ERROR_CANNOT_CONVERT_DATA            NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XPCOM,  1)
-#define NS_ERROR_OBJECT_IS_IMMUTABLE            NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XPCOM,  2)
-#define NS_ERROR_LOSS_OF_SIGNIFICANT_DATA       NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XPCOM,  3)
-
-#define NS_SUCCESS_LOSS_OF_INSIGNIFICANT_DATA   NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_XPCOM,  1)
-
-
- /*
-  * This will return the nsresult corresponding to the most recent NSPR failure
-  * returned by PR_GetError.
-  *
-  ***********************************************************************
-  *      Do not depend on this function. It will be going away!
-  ***********************************************************************
-  */
-extern NS_COM nsresult
-NS_ErrorAccordingToNSPR();
-
-
-#ifdef _MSC_VER
-#pragma warning(disable: 4251) /* 'nsCOMPtr<class nsIInputStream>' needs to have dll-interface to be used by clients of class 'nsInputStream' */
-#pragma warning(disable: 4275) /* non dll-interface class 'nsISupports' used as base for dll-interface class 'nsIRDFNode' */
-#endif
-
-#endif
-
diff --git a/third_party/mozilla/include/nsICookieStorage.h b/third_party/mozilla/include/nsICookieStorage.h
deleted file mode 100644
index c6bd7f9..0000000
--- a/third_party/mozilla/include/nsICookieStorage.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * DO NOT EDIT.  THIS FILE IS GENERATED FROM d:/projects/mozilla_1_8_0_branch/mozilla/modules/plugin/base/public/nsICookieStorage.idl
- */
-
-#ifndef __gen_nsICookieStorage_h__
-#define __gen_nsICookieStorage_h__
-
-
-#ifndef __gen_nsISupports_h__
-#include "nsISupports.h"
-#endif
-
-#ifndef __gen_nspluginroot_h__
-#include "nspluginroot.h"
-#endif
-
-/* For IDL files that don't want to include root IDL files. */
-#ifndef NS_NO_VTABLE
-#define NS_NO_VTABLE
-#endif
-// {c8c05101-cfdb-11d2-bab8-b088e084e5bc}
-#define NS_COOKIESTORAGE_CID \
-{ 0xc8c05101, 0xcfdb, 0x11d2, { 0xba, 0xb8, 0xb0, 0x88, 0xe0, 0x84, 0xe5, 0xbc } }
-
-/* starting interface:    nsICookieStorage */
-#define NS_ICOOKIESTORAGE_IID_STR "c8c05100-cfdb-11d2-bab8-b088e084e5bc"
-
-#define NS_ICOOKIESTORAGE_IID \
-  {0xc8c05100, 0xcfdb, 0x11d2, \
-    { 0xba, 0xb8, 0xb0, 0x88, 0xe0, 0x84, 0xe5, 0xbc }}
-
-/**
- * nsICookieStorage
- */
-class NS_NO_VTABLE nsICookieStorage : public nsISupports {
- public: 
-
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICOOKIESTORAGE_IID)
-
-  /**
-     * Retrieves a cookie from the browser's persistent cookie store.
-	 * @param aCookieURL    - URL string to look up cookie with.
-	 * @param aCookieBuffer - buffer large enough to accomodate cookie data.
-	 * @param aCookieSize   - on input, size of the cookie buffer, on output cookie's size.
-     */
-  /* void getCookie (in string aCookieURL, in voidPtr aCookieBuffer, in PRUint32Ref aCookieSize); */
-  NS_IMETHOD GetCookie(const char *aCookieURL, void * aCookieBuffer, PRUint32 & aCookieSize) = 0;
-
-  /**
-     * Stores a cookie in the browser's persistent cookie store.
-   * @param aCookieURL    - URL string store cookie with.
-   * @param aCookieBuffer - buffer containing cookie data.
-   * @param aCookieSize   - specifies  size of cookie data.
-     */
-  /* void setCookie (in string aCookieURL, in constVoidPtr aCookieBuffer, in unsigned long aCookieSize); */
-  NS_IMETHOD SetCookie(const char *aCookieURL, const void * aCookieBuffer, PRUint32 aCookieSize) = 0;
-
-};
-
-/* Use this macro when declaring classes that implement this interface. */
-#define NS_DECL_NSICOOKIESTORAGE \
-  NS_IMETHOD GetCookie(const char *aCookieURL, void * aCookieBuffer, PRUint32 & aCookieSize); \
-  NS_IMETHOD SetCookie(const char *aCookieURL, const void * aCookieBuffer, PRUint32 aCookieSize); 
-
-/* Use this macro to declare functions that forward the behavior of this interface to another object. */
-#define NS_FORWARD_NSICOOKIESTORAGE(_to) \
-  NS_IMETHOD GetCookie(const char *aCookieURL, void * aCookieBuffer, PRUint32 & aCookieSize) { return _to GetCookie(aCookieURL, aCookieBuffer, aCookieSize); } \
-  NS_IMETHOD SetCookie(const char *aCookieURL, const void * aCookieBuffer, PRUint32 aCookieSize) { return _to SetCookie(aCookieURL, aCookieBuffer, aCookieSize); } 
-
-/* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
-#define NS_FORWARD_SAFE_NSICOOKIESTORAGE(_to) \
-  NS_IMETHOD GetCookie(const char *aCookieURL, void * aCookieBuffer, PRUint32 & aCookieSize) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetCookie(aCookieURL, aCookieBuffer, aCookieSize); } \
-  NS_IMETHOD SetCookie(const char *aCookieURL, const void * aCookieBuffer, PRUint32 aCookieSize) { return !_to ? NS_ERROR_NULL_POINTER : _to->SetCookie(aCookieURL, aCookieBuffer, aCookieSize); } 
-
-#if 0
-/* Use the code below as a template for the implementation class for this interface. */
-
-/* Header file */
-class nsCookieStorage : public nsICookieStorage
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSICOOKIESTORAGE
-
-  nsCookieStorage();
-
-private:
-  ~nsCookieStorage();
-
-protected:
-  /* additional members */
-};
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS1(nsCookieStorage, nsICookieStorage)
-
-nsCookieStorage::nsCookieStorage()
-{
-  /* member initializers and constructor code */
-}
-
-nsCookieStorage::~nsCookieStorage()
-{
-  /* destructor code */
-}
-
-/* void getCookie (in string aCookieURL, in voidPtr aCookieBuffer, in PRUint32Ref aCookieSize); */
-NS_IMETHODIMP nsCookieStorage::GetCookie(const char *aCookieURL, void * aCookieBuffer, PRUint32 & aCookieSize)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void setCookie (in string aCookieURL, in constVoidPtr aCookieBuffer, in unsigned long aCookieSize); */
-NS_IMETHODIMP nsCookieStorage::SetCookie(const char *aCookieURL, const void * aCookieBuffer, PRUint32 aCookieSize)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* End of implementation class template. */
-#endif
-
-
-#endif /* __gen_nsICookieStorage_h__ */
diff --git a/third_party/mozilla/include/nsID.h b/third_party/mozilla/include/nsID.h
deleted file mode 100644
index 80ca9d3..0000000
--- a/third_party/mozilla/include/nsID.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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 of 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 ***** */
-
-#ifndef nsID_h__
-#define nsID_h__
-
-#include <string.h>
-
-#ifndef nscore_h___
-#include "nscore.h"
-#endif
-
-/**
- * A "unique identifier". This is modeled after OSF DCE UUIDs.
- * @status FROZEN
- */
-
-struct nsID {
-  /**
-   * @name Indentifier values
-   */
-
-  //@{
-  PRUint32 m0;
-  PRUint16 m1;
-  PRUint16 m2;
-  PRUint8 m3[8];
-  //@}
-
-  /**
-   * @name Methods
-   */
-
-  //@{
-  /**
-   * Equivalency method. Compares this nsID with another.
-   * @return <b>PR_TRUE</b> if they are the same, <b>PR_FALSE</b> if not.
-   */
-
-  inline PRBool Equals(const nsID& other) const {
-    // One would think that this could be done faster with a really
-    // efficient implementation of memcmp(), but evidently no
-    // memcmp()'s out there are better than this code.
-    //
-    // See bug http://bugzilla.mozilla.org/show_bug.cgi?id=164580 for
-    // details.
-
-    return (PRBool)
-      ((((PRUint32*) &m0)[0] == ((PRUint32*) &other.m0)[0]) &&
-       (((PRUint32*) &m0)[1] == ((PRUint32*) &other.m0)[1]) &&
-       (((PRUint32*) &m0)[2] == ((PRUint32*) &other.m0)[2]) &&
-       (((PRUint32*) &m0)[3] == ((PRUint32*) &other.m0)[3]));
-  }
-
-  /**
-   * nsID Parsing method. Turns a {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}
-   * string into an nsID
-   */
-  NS_COM_GLUE PRBool Parse(const char *aIDStr);
-
-  /**
-   * nsID string encoder. Returns an allocated string in 
-   * {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx} format. Caller should free string.
-   */
-  NS_COM_GLUE char* ToString() const;
-  //@}
-};
-
-/*
- * Class IDs
- */
-
-typedef nsID nsCID;
-
-// Define an CID
-#define NS_DEFINE_CID(_name, _cidspec) \
-  const nsCID _name = _cidspec
-
-#define REFNSCID const nsCID&
-
-/**
- * An "interface id" which can be used to uniquely identify a given
- * interface.
- */
-
-typedef nsID nsIID;
-
-/**
- * A macro shorthand for <tt>const nsIID&<tt>
- */
-
-#define REFNSIID const nsIID&
-
-/**
- * Define an IID
- * obsolete - do not use this macro
- */
- 
-#define NS_DEFINE_IID(_name, _iidspec) \
-  const nsIID _name = _iidspec
-
-/**
- * A macro to build the static const IID accessor method
- */
-
-#define NS_DEFINE_STATIC_IID_ACCESSOR(the_iid) \
-  static const nsIID& GetIID() {static const nsIID iid = the_iid; return iid;}
-
-/**
- * A macro to build the static const CID accessor method
- */
-
-#define NS_DEFINE_STATIC_CID_ACCESSOR(the_cid) \
-  static const nsID& GetCID() {static const nsID cid = the_cid; return cid;}
-
-#endif
-
diff --git a/third_party/mozilla/include/nsIPluginManager.h b/third_party/mozilla/include/nsIPluginManager.h
deleted file mode 100644
index e2c0e61..0000000
--- a/third_party/mozilla/include/nsIPluginManager.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * DO NOT EDIT.  THIS FILE IS GENERATED FROM d:/projects/mozilla_1_8_0_branch/mozilla/modules/plugin/base/public/nsIPluginManager.idl
- */
-
-#ifndef __gen_nsIPluginManager_h__
-#define __gen_nsIPluginManager_h__
-
-
-#ifndef __gen_nsISupports_h__
-#include "nsISupports.h"
-#endif
-
-#ifndef __gen_nspluginroot_h__
-#include "nspluginroot.h"
-#endif
-
-/* For IDL files that don't want to include root IDL files. */
-#ifndef NS_NO_VTABLE
-#define NS_NO_VTABLE
-#endif
-#include "nsplugindefs.h"
-#define NS_PLUGINMANAGER_CID                         \
-{ /* ce768990-5a4e-11d2-8164-006008119d7a */         \
-    0xce768990,                                      \
-    0x5a4e,                                          \
-    0x11d2,                                          \
-    {0x81, 0x64, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \
-}
-class nsIPluginStreamListener; /* forward declaration */
-
-
-/* starting interface:    nsIPluginManager */
-#define NS_IPLUGINMANAGER_IID_STR "da58ad80-4eb6-11d2-8164-006008119d7a"
-
-#define NS_IPLUGINMANAGER_IID \
-  {0xda58ad80, 0x4eb6, 0x11d2, \
-    { 0x81, 0x64, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a }}
-
-class nsIPluginManager : public nsISupports {
- public: 
-
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLUGINMANAGER_IID)
-
-  /**
-     * Returns the value of a variable associated with the plugin manager.
-     *
-     * (Corresponds to NPN_GetValue.)
-     *
-     * @param variable - the plugin manager variable to get
-     * @param value - the address of where to store the resulting value
-     * @result - NS_OK if this operation was successful
-     */
-  /* [noscript] void GetValue (in nsPluginManagerVariable variable, in nativeVoid value); */
-  NS_IMETHOD GetValue(nsPluginManagerVariable variable, void * value) = 0;
-
-  /**
-     * Causes the plugins directory to be searched again for new plugin 
-     * libraries.
-     *
-     * (Corresponds to NPN_ReloadPlugins.)
-     *
-     * @param reloadPages - indicates whether currently visible pages should 
-     * also be reloaded
-     */
-  /* void reloadPlugins (in boolean reloadPages); */
-  NS_IMETHOD ReloadPlugins(PRBool reloadPages) = 0;
-
-  /**
-     * Returns the user agent string for the browser. 
-     *
-     * (Corresponds to NPN_UserAgent.)
-     *
-     * @param resultingAgentString - the resulting user agent string
-     */
-  /* [noscript] void UserAgent (in nativeChar resultingAgentString); */
-  NS_IMETHOD UserAgent(const char * * resultingAgentString) = 0;
-
-    NS_IMETHOD
-    GetURL(nsISupports* pluginInst,
-           const char* url,
-           const char* target = NULL,
-           nsIPluginStreamListener* streamListener = NULL,
-           const char* altHost = NULL,
-           const char* referrer = NULL,
-           PRBool forceJSEnabled = PR_FALSE) = 0;
-    NS_IMETHOD
-    PostURL(nsISupports* pluginInst,
-            const char* url,
-            PRUint32 postDataLen,
-            const char* postData,
-            PRBool isFile = PR_FALSE,
-            const char* target = NULL,
-            nsIPluginStreamListener* streamListener = NULL,
-            const char* altHost = NULL,
-            const char* referrer = NULL,
-            PRBool forceJSEnabled = PR_FALSE,
-            PRUint32 postHeadersLength = 0,
-            const char* postHeaders = NULL) = 0;
-  /**
-     * Fetches a URL.
-     *
-     * (Corresponds to NPN_GetURL and NPN_GetURLNotify.)
-     *
-     * @param pluginInst - the plugin making the request. If NULL, the URL
-     *   is fetched in the background.
-     * @param url - the URL to fetch
-     * @param target - the target window into which to load the URL, or NULL if
-     *   the data should be returned to the plugin via streamListener.
-     * @param streamListener - a stream listener to be used to return data to
-     *   the plugin. May be NULL if target is not NULL.
-     * @param altHost - an IP-address string that will be used instead of the 
-     *   host specified in the URL. This is used to prevent DNS-spoofing 
-     *   attacks. Can be defaulted to NULL meaning use the host in the URL.
-     * @param referrer - the referring URL (may be NULL)
-     * @param forceJSEnabled - forces JavaScript to be enabled for 'javascript:'
-     *   URLs, even if the user currently has JavaScript disabled (usually 
-     *   specify PR_FALSE) 
-     * @result - NS_OK if this operation was successful
-     */
-/**
-     * Posts to a URL with post data and/or post headers.
-     *
-     * (Corresponds to NPN_PostURL and NPN_PostURLNotify.)
-     *
-     * @param pluginInst - the plugin making the request. If NULL, the URL
-     *   is fetched in the background.
-     * @param url - the URL to fetch
-     * @param postDataLength - the length of postData (if non-NULL)
-     * @param postData - the data to POST. NULL specifies that there is not post
-     *   data
-     * @param isFile - whether the postData specifies the name of a file to 
-     *   post instead of data. The file will be deleted afterwards.
-     * @param target - the target window into which to load the URL, or NULL if
-     *   the data should be returned to the plugin via streamListener.
-     * @param streamListener - a stream listener to be used to return data to
-     *   the plugin. May be NULL if target is not NULL.
-     * @param altHost - an IP-address string that will be used instead of the 
-     *   host specified in the URL. This is used to prevent DNS-spoofing 
-     *   attacks. Can be defaulted to NULL meaning use the host in the URL.
-     * @param referrer - the referring URL (may be NULL)
-     * @param forceJSEnabled - forces JavaScript to be enabled for 'javascript:'
-     *   URLs, even if the user currently has JavaScript disabled (usually 
-     *   specify PR_FALSE) 
-     * @param postHeadersLength - the length of postHeaders (if non-NULL)
-     * @param postHeaders - the headers to POST. Must be in the form of
-     * "HeaderName: HeaderValue\r\n".  Each header, including the last,
-     * must be followed by "\r\n".  NULL specifies that there are no
-     * post headers
-     * @result - NS_OK if this operation was successful
-     */
-/**
-     * Persistently register a plugin with the plugin
-     * manager. aMimeTypes, aMimeDescriptions, and aFileExtensions are
-     * parallel arrays that contain information about the MIME types
-     * that the plugin supports.
-     *
-     * @param aCID - the plugin's CID
-     * @param aPluginName - the plugin's name
-     * @param aDescription - a description of the plugin
-     * @param aMimeTypes - an array of MIME types that the plugin
-     *   is prepared to handle
-     * @param aMimeDescriptions - an array of descriptions for the
-     *   MIME types that the plugin can handle.
-     * @param aFileExtensions - an array of file extensions for
-     *   the MIME types that the plugin can handle.
-     * @param aCount - the number of elements in the aMimeTypes,
-     *   aMimeDescriptions, and aFileExtensions arrays.
-     * @result - NS_OK if the operation was successful.
-     */
-  /* [noscript] void RegisterPlugin (in REFNSIID aCID, in string aPluginName, in string aDescription, in nativeChar aMimeTypes, in nativeChar aMimeDescriptions, in nativeChar aFileExtensions, in long aCount); */
-  NS_IMETHOD RegisterPlugin(REFNSIID aCID, const char *aPluginName, const char *aDescription, const char * * aMimeTypes, const char * * aMimeDescriptions, const char * * aFileExtensions, PRInt32 aCount) = 0;
-
-  /**
-     * Unregister a plugin from the plugin manager
-     *
-     * @param aCID the CID of the plugin to unregister.
-     * @result - NS_OK if the operation was successful.
-     */
-  /* [noscript] void UnregisterPlugin (in REFNSIID aCID); */
-  NS_IMETHOD UnregisterPlugin(REFNSIID aCID) = 0;
-
-    /**
-     * Fetches a URL, with Headers
-     * @see GetURL.  Identical except for additional params headers and
-     * headersLen
-     * @param getHeadersLength - the length of getHeaders (if non-NULL)
-     * @param getHeaders - the headers to GET. Must be in the form of
-     * "HeaderName: HeaderValue\r\n".  Each header, including the last,
-     * must be followed by "\r\n".  NULL specifies that there are no
-     * get headers
-     * @result - NS_OK if this operation was successful
-     */
-    NS_IMETHOD
-    GetURLWithHeaders(nsISupports* pluginInst,
-                      const char* url,
-                      const char* target = NULL,
-                      nsIPluginStreamListener* streamListener = NULL,
-                      const char* altHost = NULL,
-                      const char* referrer = NULL,
-                      PRBool forceJSEnabled = PR_FALSE,
-                      PRUint32 getHeadersLength = 0,
-                      const char* getHeaders = NULL) = 0;
-};
-
-/* Use this macro when declaring classes that implement this interface. */
-#define NS_DECL_NSIPLUGINMANAGER \
-  NS_IMETHOD GetValue(nsPluginManagerVariable variable, void * value); \
-  NS_IMETHOD ReloadPlugins(PRBool reloadPages); \
-  NS_IMETHOD UserAgent(const char * * resultingAgentString); \
-  NS_IMETHOD RegisterPlugin(REFNSIID aCID, const char *aPluginName, const char *aDescription, const char * * aMimeTypes, const char * * aMimeDescriptions, const char * * aFileExtensions, PRInt32 aCount); \
-  NS_IMETHOD UnregisterPlugin(REFNSIID aCID); \
-
-/* Use this macro to declare functions that forward the behavior of this interface to another object. */
-#define NS_FORWARD_NSIPLUGINMANAGER(_to) \
-  NS_IMETHOD GetValue(nsPluginManagerVariable variable, void * value) { return _to GetValue(variable, value); } \
-  NS_IMETHOD ReloadPlugins(PRBool reloadPages) { return _to ReloadPlugins(reloadPages); } \
-  NS_IMETHOD UserAgent(const char * * resultingAgentString) { return _to UserAgent(resultingAgentString); } \
-  NS_IMETHOD RegisterPlugin(REFNSIID aCID, const char *aPluginName, const char *aDescription, const char * * aMimeTypes, const char * * aMimeDescriptions, const char * * aFileExtensions, PRInt32 aCount) { return _to RegisterPlugin(aCID, aPluginName, aDescription, aMimeTypes, aMimeDescriptions, aFileExtensions, aCount); } \
-  NS_IMETHOD UnregisterPlugin(REFNSIID aCID) { return _to UnregisterPlugin(aCID); } \
-
-/* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
-#define NS_FORWARD_SAFE_NSIPLUGINMANAGER(_to) \
-  NS_IMETHOD GetValue(nsPluginManagerVariable variable, void * value) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetValue(variable, value); } \
-  NS_IMETHOD ReloadPlugins(PRBool reloadPages) { return !_to ? NS_ERROR_NULL_POINTER : _to->ReloadPlugins(reloadPages); } \
-  NS_IMETHOD UserAgent(const char * * resultingAgentString) { return !_to ? NS_ERROR_NULL_POINTER : _to->UserAgent(resultingAgentString); } \
-  NS_IMETHOD RegisterPlugin(REFNSIID aCID, const char *aPluginName, const char *aDescription, const char * * aMimeTypes, const char * * aMimeDescriptions, const char * * aFileExtensions, PRInt32 aCount) { return !_to ? NS_ERROR_NULL_POINTER : _to->RegisterPlugin(aCID, aPluginName, aDescription, aMimeTypes, aMimeDescriptions, aFileExtensions, aCount); } \
-  NS_IMETHOD UnregisterPlugin(REFNSIID aCID) { return !_to ? NS_ERROR_NULL_POINTER : _to->UnregisterPlugin(aCID); } \
-
-#if 0
-/* Use the code below as a template for the implementation class for this interface. */
-
-/* Header file */
-class nsPluginManager : public nsIPluginManager
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIPLUGINMANAGER
-
-  nsPluginManager();
-
-private:
-  ~nsPluginManager();
-
-protected:
-  /* additional members */
-};
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS1(nsPluginManager, nsIPluginManager)
-
-nsPluginManager::nsPluginManager()
-{
-  /* member initializers and constructor code */
-}
-
-nsPluginManager::~nsPluginManager()
-{
-  /* destructor code */
-}
-
-/* [noscript] void GetValue (in nsPluginManagerVariable variable, in nativeVoid value); */
-NS_IMETHODIMP nsPluginManager::GetValue(nsPluginManagerVariable variable, void * value)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void reloadPlugins (in boolean reloadPages); */
-NS_IMETHODIMP nsPluginManager::ReloadPlugins(PRBool reloadPages)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* [noscript] void UserAgent (in nativeChar resultingAgentString); */
-NS_IMETHODIMP nsPluginManager::UserAgent(const char * * resultingAgentString)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* [noscript] void RegisterPlugin (in REFNSIID aCID, in string aPluginName, in string aDescription, in nativeChar aMimeTypes, in nativeChar aMimeDescriptions, in nativeChar aFileExtensions, in long aCount); */
-NS_IMETHODIMP nsPluginManager::RegisterPlugin(REFNSIID aCID, const char *aPluginName, const char *aDescription, const char * * aMimeTypes, const char * * aMimeDescriptions, const char * * aFileExtensions, PRInt32 aCount)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* [noscript] void UnregisterPlugin (in REFNSIID aCID); */
-NS_IMETHODIMP nsPluginManager::UnregisterPlugin(REFNSIID aCID)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* End of implementation class template. */
-#endif
-
-
-#endif /* __gen_nsIPluginManager_h__ */
diff --git a/third_party/mozilla/include/nsIPluginManager2.h b/third_party/mozilla/include/nsIPluginManager2.h
deleted file mode 100644
index 75260d9..0000000
--- a/third_party/mozilla/include/nsIPluginManager2.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * DO NOT EDIT.  THIS FILE IS GENERATED FROM d:/projects/mozilla_1_8_0_branch/mozilla/modules/plugin/base/public/nsIPluginManager2.idl
- */
-
-#ifndef __gen_nsIPluginManager2_h__
-#define __gen_nsIPluginManager2_h__
-
-
-#ifndef __gen_nsIPluginManager_h__
-#include "nsIPluginManager.h"
-#endif
-
-/* For IDL files that don't want to include root IDL files. */
-#ifndef NS_NO_VTABLE
-#define NS_NO_VTABLE
-#endif
-class nsIPlugin; /* forward declaration */
-
-class nsIEventHandler; /* forward declaration */
-
-
-/* starting interface:    nsIPluginManager2 */
-#define NS_IPLUGINMANAGER2_IID_STR "d2962dc0-4eb6-11d2-8164-006008119d7a"
-
-#define NS_IPLUGINMANAGER2_IID \
-  {0xd2962dc0, 0x4eb6, 0x11d2, \
-    { 0x81, 0x64, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a }}
-
-/**
- * Plugin Manager 2 Interface
- * These extensions to nsIPluginManager are only available in Communicator 5.0.
- */
-class NS_NO_VTABLE nsIPluginManager2 : public nsIPluginManager {
- public: 
-
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLUGINMANAGER2_IID)
-
-  /**
-   * Puts up a wait cursor.
-   *
-   * @result - NS_OK if this operation was successful
-   */
-  /* void beginWaitCursor (); */
-  NS_IMETHOD BeginWaitCursor(void) = 0;
-
-  /**
-   * Restores the previous (non-wait) cursor.
-   *
-   * @result - NS_OK if this operation was successful
-   */
-  /* void endWaitCursor (); */
-  NS_IMETHOD EndWaitCursor(void) = 0;
-
-  /**
-   * Returns true if a URL protocol (e.g. "http") is supported.
-   *
-   * @param aProtocol - the protocol name
-   * @param aResult   - true if the protocol is supported
-   * @result          - NS_OK if this operation was successful
-   */
-  /* void supportsURLProtocol (in string aProtocol, out boolean aResult); */
-  NS_IMETHOD SupportsURLProtocol(const char *aProtocol, PRBool *aResult) = 0;
-
-  /**
-   * This method may be called by the plugin to indicate that an error 
-   * has occurred, e.g. that the plugin has failed or is shutting down 
-   * spontaneously. This allows the browser to clean up any plugin-specific 
-   * state.
-   *
-   * @param aPlugin - the plugin whose status is changing
-   * @param aStatus - the error status value
-   * @result        - NS_OK if this operation was successful
-   */
-  /* void notifyStatusChange (in nsIPlugin aPlugin, in nsresult aStatus); */
-  NS_IMETHOD NotifyStatusChange(nsIPlugin *aPlugin, nsresult aStatus) = 0;
-
-  /**
-   * Returns the proxy info for a given URL. The caller is required to
-   * free the resulting memory with nsIMalloc::Free. The result will be in the
-   * following format
-   * 
-   *   i)   "DIRECT"  -- no proxy
-   *   ii)  "PROXY xxx.xxx.xxx.xxx"   -- use proxy
-   *   iii) "SOCKS xxx.xxx.xxx.xxx"  -- use SOCKS
-   *   iv)  Mixed. e.g. "PROXY 111.111.111.111;PROXY 112.112.112.112",
-   *                    "PROXY 111.111.111.111;SOCKS 112.112.112.112"....
-   *
-   * Which proxy/SOCKS to use is determined by the plugin.
-   */
-  /* void findProxyForURL (in string aURL, out string aResult); */
-  NS_IMETHOD FindProxyForURL(const char *aURL, char **aResult) = 0;
-
-  /**
-   * Registers a top-level window with the browser. Events received by that
-   * window will be dispatched to the event handler specified.
-   * 
-   * @param aHandler - the event handler for the window
-   * @param aWindow  - the platform window reference
-   * @result         - NS_OK if this operation was successful
-   */
-  /* void registerWindow (in nsIEventHandler aHandler, in nsPluginPlatformWindowRef aWindow); */
-  NS_IMETHOD RegisterWindow(nsIEventHandler *aHandler, nsPluginPlatformWindowRef aWindow) = 0;
-
-  /**
-   * Unregisters a top-level window with the browser. The handler and window pair
-   * should be the same as that specified to RegisterWindow.
-   *
-   * @param aHandler - the event handler for the window
-   * @param aWindow  - the platform window reference
-   * @result         - NS_OK if this operation was successful
-   */
-  /* void unregisterWindow (in nsIEventHandler aHandler, in nsPluginPlatformWindowRef aWindow); */
-  NS_IMETHOD UnregisterWindow(nsIEventHandler *aHandler, nsPluginPlatformWindowRef aWindow) = 0;
-
-  /**
-   * Allocates a new menu ID (for the Mac).
-   *
-   * @param aHandler   - the event handler for the window
-   * @param aIsSubmenu - whether this is a sub-menu ID or not
-   * @param aResult    - the resulting menu ID
-   * @result           - NS_OK if this operation was successful
-   */
-  /* void allocateMenuID (in nsIEventHandler aHandler, in boolean aIsSubmenu, out short aResult); */
-  NS_IMETHOD AllocateMenuID(nsIEventHandler *aHandler, PRBool aIsSubmenu, PRInt16 *aResult) = 0;
-
-  /**
-   * Deallocates a menu ID (for the Mac).
-   *
-   * @param aHandler - the event handler for the window
-   * @param aMenuID  - the menu ID
-   * @result         - NS_OK if this operation was successful
-   */
-  /* void deallocateMenuID (in nsIEventHandler aHandler, in short aMenuID); */
-  NS_IMETHOD DeallocateMenuID(nsIEventHandler *aHandler, PRInt16 aMenuID) = 0;
-
-  /**
-   * Indicates whether this event handler has allocated the given menu ID.
-   *
-   * @param aHandler - the event handler for the window
-   * @param aMenuID  - the menu ID
-   * @param aResult  - returns PR_TRUE if the menu ID is allocated
-   * @result         - NS_OK if this operation was successful
-   */
-  /* void hasAllocatedMenuID (in nsIEventHandler aHandler, in short aMenuID, out boolean aResult); */
-  NS_IMETHOD HasAllocatedMenuID(nsIEventHandler *aHandler, PRInt16 aMenuID, PRBool *aResult) = 0;
-
-};
-
-/* Use this macro when declaring classes that implement this interface. */
-#define NS_DECL_NSIPLUGINMANAGER2 \
-  NS_IMETHOD BeginWaitCursor(void); \
-  NS_IMETHOD EndWaitCursor(void); \
-  NS_IMETHOD SupportsURLProtocol(const char *aProtocol, PRBool *aResult); \
-  NS_IMETHOD NotifyStatusChange(nsIPlugin *aPlugin, nsresult aStatus); \
-  NS_IMETHOD FindProxyForURL(const char *aURL, char **aResult); \
-  NS_IMETHOD RegisterWindow(nsIEventHandler *aHandler, nsPluginPlatformWindowRef aWindow); \
-  NS_IMETHOD UnregisterWindow(nsIEventHandler *aHandler, nsPluginPlatformWindowRef aWindow); \
-  NS_IMETHOD AllocateMenuID(nsIEventHandler *aHandler, PRBool aIsSubmenu, PRInt16 *aResult); \
-  NS_IMETHOD DeallocateMenuID(nsIEventHandler *aHandler, PRInt16 aMenuID); \
-  NS_IMETHOD HasAllocatedMenuID(nsIEventHandler *aHandler, PRInt16 aMenuID, PRBool *aResult); 
-
-/* Use this macro to declare functions that forward the behavior of this interface to another object. */
-#define NS_FORWARD_NSIPLUGINMANAGER2(_to) \
-  NS_IMETHOD BeginWaitCursor(void) { return _to BeginWaitCursor(); } \
-  NS_IMETHOD EndWaitCursor(void) { return _to EndWaitCursor(); } \
-  NS_IMETHOD SupportsURLProtocol(const char *aProtocol, PRBool *aResult) { return _to SupportsURLProtocol(aProtocol, aResult); } \
-  NS_IMETHOD NotifyStatusChange(nsIPlugin *aPlugin, nsresult aStatus) { return _to NotifyStatusChange(aPlugin, aStatus); } \
-  NS_IMETHOD FindProxyForURL(const char *aURL, char **aResult) { return _to FindProxyForURL(aURL, aResult); } \
-  NS_IMETHOD RegisterWindow(nsIEventHandler *aHandler, nsPluginPlatformWindowRef aWindow) { return _to RegisterWindow(aHandler, aWindow); } \
-  NS_IMETHOD UnregisterWindow(nsIEventHandler *aHandler, nsPluginPlatformWindowRef aWindow) { return _to UnregisterWindow(aHandler, aWindow); } \
-  NS_IMETHOD AllocateMenuID(nsIEventHandler *aHandler, PRBool aIsSubmenu, PRInt16 *aResult) { return _to AllocateMenuID(aHandler, aIsSubmenu, aResult); } \
-  NS_IMETHOD DeallocateMenuID(nsIEventHandler *aHandler, PRInt16 aMenuID) { return _to DeallocateMenuID(aHandler, aMenuID); } \
-  NS_IMETHOD HasAllocatedMenuID(nsIEventHandler *aHandler, PRInt16 aMenuID, PRBool *aResult) { return _to HasAllocatedMenuID(aHandler, aMenuID, aResult); } 
-
-/* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
-#define NS_FORWARD_SAFE_NSIPLUGINMANAGER2(_to) \
-  NS_IMETHOD BeginWaitCursor(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->BeginWaitCursor(); } \
-  NS_IMETHOD EndWaitCursor(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->EndWaitCursor(); } \
-  NS_IMETHOD SupportsURLProtocol(const char *aProtocol, PRBool *aResult) { return !_to ? NS_ERROR_NULL_POINTER : _to->SupportsURLProtocol(aProtocol, aResult); } \
-  NS_IMETHOD NotifyStatusChange(nsIPlugin *aPlugin, nsresult aStatus) { return !_to ? NS_ERROR_NULL_POINTER : _to->NotifyStatusChange(aPlugin, aStatus); } \
-  NS_IMETHOD FindProxyForURL(const char *aURL, char **aResult) { return !_to ? NS_ERROR_NULL_POINTER : _to->FindProxyForURL(aURL, aResult); } \
-  NS_IMETHOD RegisterWindow(nsIEventHandler *aHandler, nsPluginPlatformWindowRef aWindow) { return !_to ? NS_ERROR_NULL_POINTER : _to->RegisterWindow(aHandler, aWindow); } \
-  NS_IMETHOD UnregisterWindow(nsIEventHandler *aHandler, nsPluginPlatformWindowRef aWindow) { return !_to ? NS_ERROR_NULL_POINTER : _to->UnregisterWindow(aHandler, aWindow); } \
-  NS_IMETHOD AllocateMenuID(nsIEventHandler *aHandler, PRBool aIsSubmenu, PRInt16 *aResult) { return !_to ? NS_ERROR_NULL_POINTER : _to->AllocateMenuID(aHandler, aIsSubmenu, aResult); } \
-  NS_IMETHOD DeallocateMenuID(nsIEventHandler *aHandler, PRInt16 aMenuID) { return !_to ? NS_ERROR_NULL_POINTER : _to->DeallocateMenuID(aHandler, aMenuID); } \
-  NS_IMETHOD HasAllocatedMenuID(nsIEventHandler *aHandler, PRInt16 aMenuID, PRBool *aResult) { return !_to ? NS_ERROR_NULL_POINTER : _to->HasAllocatedMenuID(aHandler, aMenuID, aResult); } 
-
-#if 0
-/* Use the code below as a template for the implementation class for this interface. */
-
-/* Header file */
-class nsPluginManager2 : public nsIPluginManager2
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIPLUGINMANAGER2
-
-  nsPluginManager2();
-
-private:
-  ~nsPluginManager2();
-
-protected:
-  /* additional members */
-};
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS1(nsPluginManager2, nsIPluginManager2)
-
-nsPluginManager2::nsPluginManager2()
-{
-  /* member initializers and constructor code */
-}
-
-nsPluginManager2::~nsPluginManager2()
-{
-  /* destructor code */
-}
-
-/* void beginWaitCursor (); */
-NS_IMETHODIMP nsPluginManager2::BeginWaitCursor()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void endWaitCursor (); */
-NS_IMETHODIMP nsPluginManager2::EndWaitCursor()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void supportsURLProtocol (in string aProtocol, out boolean aResult); */
-NS_IMETHODIMP nsPluginManager2::SupportsURLProtocol(const char *aProtocol, PRBool *aResult)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void notifyStatusChange (in nsIPlugin aPlugin, in nsresult aStatus); */
-NS_IMETHODIMP nsPluginManager2::NotifyStatusChange(nsIPlugin *aPlugin, nsresult aStatus)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void findProxyForURL (in string aURL, out string aResult); */
-NS_IMETHODIMP nsPluginManager2::FindProxyForURL(const char *aURL, char **aResult)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void registerWindow (in nsIEventHandler aHandler, in nsPluginPlatformWindowRef aWindow); */
-NS_IMETHODIMP nsPluginManager2::RegisterWindow(nsIEventHandler *aHandler, nsPluginPlatformWindowRef aWindow)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void unregisterWindow (in nsIEventHandler aHandler, in nsPluginPlatformWindowRef aWindow); */
-NS_IMETHODIMP nsPluginManager2::UnregisterWindow(nsIEventHandler *aHandler, nsPluginPlatformWindowRef aWindow)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void allocateMenuID (in nsIEventHandler aHandler, in boolean aIsSubmenu, out short aResult); */
-NS_IMETHODIMP nsPluginManager2::AllocateMenuID(nsIEventHandler *aHandler, PRBool aIsSubmenu, PRInt16 *aResult)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void deallocateMenuID (in nsIEventHandler aHandler, in short aMenuID); */
-NS_IMETHODIMP nsPluginManager2::DeallocateMenuID(nsIEventHandler *aHandler, PRInt16 aMenuID)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void hasAllocatedMenuID (in nsIEventHandler aHandler, in short aMenuID, out boolean aResult); */
-NS_IMETHODIMP nsPluginManager2::HasAllocatedMenuID(nsIEventHandler *aHandler, PRInt16 aMenuID, PRBool *aResult)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* End of implementation class template. */
-#endif
-
-
-#endif /* __gen_nsIPluginManager2_h__ */
diff --git a/third_party/mozilla/include/nsIServiceManager.h b/third_party/mozilla/include/nsIServiceManager.h
deleted file mode 100644
index f783ce6..0000000
--- a/third_party/mozilla/include/nsIServiceManager.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * DO NOT EDIT.  THIS FILE IS GENERATED FROM c:/builds/tinderbox/XR-Mozilla1.8.0-Release/WINNT_5.2_Depend/mozilla/xpcom/components/nsIServiceManager.idl
- */
-
-#ifndef __gen_nsIServiceManager_h__
-#define __gen_nsIServiceManager_h__
-
-
-#ifndef __gen_nsISupports_h__
-#include "nsISupports.h"
-#endif
-
-/* For IDL files that don't want to include root IDL files. */
-#ifndef NS_NO_VTABLE
-#define NS_NO_VTABLE
-#endif
-
-/* starting interface:    nsIServiceManager */
-#define NS_ISERVICEMANAGER_IID_STR "8bb35ed9-e332-462d-9155-4a002ab5c958"
-
-#define NS_ISERVICEMANAGER_IID \
-  {0x8bb35ed9, 0xe332, 0x462d, \
-    { 0x91, 0x55, 0x4a, 0x00, 0x2a, 0xb5, 0xc9, 0x58 }}
-
-/**
- * The nsIServiceManager manager interface provides a means to obtain
- * global services in an application. The service manager depends on the 
- * repository to find and instantiate factories to obtain services.
- *
- * Users of the service manager must first obtain a pointer to the global
- * service manager by calling NS_GetServiceManager. After that, 
- * they can request specific services by calling GetService. When they are
- * finished they can NS_RELEASE() the service as usual.
- *
- * A user of a service may keep references to particular services indefinitely
- * and only must call Release when it shuts down.
- *
- * @status FROZEN
- */
-class NS_NO_VTABLE nsIServiceManager : public nsISupports {
- public: 
-
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISERVICEMANAGER_IID)
-
-  /**
-     * getServiceByContractID
-     *
-     * Returns the instance that implements aClass or aContractID and the
-     * interface aIID.  This may result in the instance being created.
-     *
-     * @param aClass or aContractID : aClass or aContractID of object 
-     *                                instance requested
-     * @param aIID : IID of interface requested
-     * @param result : resulting service 
-     */
-  /* void getService (in nsCIDRef aClass, in nsIIDRef aIID, [iid_is (aIID), retval] out nsQIResult result); */
-  NS_IMETHOD GetService(const nsCID & aClass, const nsIID & aIID, void * *result) = 0;
-
-  /* void getServiceByContractID (in string aContractID, in nsIIDRef aIID, [iid_is (aIID), retval] out nsQIResult result); */
-  NS_IMETHOD GetServiceByContractID(const char *aContractID, const nsIID & aIID, void * *result) = 0;
-
-  /**
-     * isServiceInstantiated
-     *
-     * isServiceInstantiated will return a true if the service has already
-     * been created, otherwise false
-     *
-     * @param aClass or aContractID : aClass or aContractID of object 
-     *                                instance requested
-     * @param aIID : IID of interface requested
-     * @param aIID : IID of interface requested
-     */
-  /* boolean isServiceInstantiated (in nsCIDRef aClass, in nsIIDRef aIID); */
-  NS_IMETHOD IsServiceInstantiated(const nsCID & aClass, const nsIID & aIID, PRBool *_retval) = 0;
-
-  /* boolean isServiceInstantiatedByContractID (in string aContractID, in nsIIDRef aIID); */
-  NS_IMETHOD IsServiceInstantiatedByContractID(const char *aContractID, const nsIID & aIID, PRBool *_retval) = 0;
-
-};
-
-/* Use this macro when declaring classes that implement this interface. */
-#define NS_DECL_NSISERVICEMANAGER \
-  NS_IMETHOD GetService(const nsCID & aClass, const nsIID & aIID, void * *result); \
-  NS_IMETHOD GetServiceByContractID(const char *aContractID, const nsIID & aIID, void * *result); \
-  NS_IMETHOD IsServiceInstantiated(const nsCID & aClass, const nsIID & aIID, PRBool *_retval); \
-  NS_IMETHOD IsServiceInstantiatedByContractID(const char *aContractID, const nsIID & aIID, PRBool *_retval); 
-
-/* Use this macro to declare functions that forward the behavior of this interface to another object. */
-#define NS_FORWARD_NSISERVICEMANAGER(_to) \
-  NS_IMETHOD GetService(const nsCID & aClass, const nsIID & aIID, void * *result) { return _to GetService(aClass, aIID, result); } \
-  NS_IMETHOD GetServiceByContractID(const char *aContractID, const nsIID & aIID, void * *result) { return _to GetServiceByContractID(aContractID, aIID, result); } \
-  NS_IMETHOD IsServiceInstantiated(const nsCID & aClass, const nsIID & aIID, PRBool *_retval) { return _to IsServiceInstantiated(aClass, aIID, _retval); } \
-  NS_IMETHOD IsServiceInstantiatedByContractID(const char *aContractID, const nsIID & aIID, PRBool *_retval) { return _to IsServiceInstantiatedByContractID(aContractID, aIID, _retval); } 
-
-/* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
-#define NS_FORWARD_SAFE_NSISERVICEMANAGER(_to) \
-  NS_IMETHOD GetService(const nsCID & aClass, const nsIID & aIID, void * *result) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetService(aClass, aIID, result); } \
-  NS_IMETHOD GetServiceByContractID(const char *aContractID, const nsIID & aIID, void * *result) { return !_to ? NS_ERROR_NULL_POINTER : _to->GetServiceByContractID(aContractID, aIID, result); } \
-  NS_IMETHOD IsServiceInstantiated(const nsCID & aClass, const nsIID & aIID, PRBool *_retval) { return !_to ? NS_ERROR_NULL_POINTER : _to->IsServiceInstantiated(aClass, aIID, _retval); } \
-  NS_IMETHOD IsServiceInstantiatedByContractID(const char *aContractID, const nsIID & aIID, PRBool *_retval) { return !_to ? NS_ERROR_NULL_POINTER : _to->IsServiceInstantiatedByContractID(aContractID, aIID, _retval); } 
-
-#if 0
-/* Use the code below as a template for the implementation class for this interface. */
-
-/* Header file */
-class nsServiceManager : public nsIServiceManager
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISERVICEMANAGER
-
-  nsServiceManager();
-
-private:
-  ~nsServiceManager();
-
-protected:
-  /* additional members */
-};
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS1(nsServiceManager, nsIServiceManager)
-
-nsServiceManager::nsServiceManager()
-{
-  /* member initializers and constructor code */
-}
-
-nsServiceManager::~nsServiceManager()
-{
-  /* destructor code */
-}
-
-/* void getService (in nsCIDRef aClass, in nsIIDRef aIID, [iid_is (aIID), retval] out nsQIResult result); */
-NS_IMETHODIMP nsServiceManager::GetService(const nsCID & aClass, const nsIID & aIID, void * *result)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void getServiceByContractID (in string aContractID, in nsIIDRef aIID, [iid_is (aIID), retval] out nsQIResult result); */
-NS_IMETHODIMP nsServiceManager::GetServiceByContractID(const char *aContractID, const nsIID & aIID, void * *result)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* boolean isServiceInstantiated (in nsCIDRef aClass, in nsIIDRef aIID); */
-NS_IMETHODIMP nsServiceManager::IsServiceInstantiated(const nsCID & aClass, const nsIID & aIID, PRBool *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* boolean isServiceInstantiatedByContractID (in string aContractID, in nsIIDRef aIID); */
-NS_IMETHODIMP nsServiceManager::IsServiceInstantiatedByContractID(const char *aContractID, const nsIID & aIID, PRBool *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* End of implementation class template. */
-#endif
-
-#define NS_ERROR_SERVICE_NOT_AVAILABLE  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XPCOM, 22)
-/**
- * @status DEPRECATED
- */
-#define NS_ERROR_SERVICE_NOT_FOUND      NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_XPCOM, 22)
-/**
- * @status DEPRECATED
- */
-#define NS_ERROR_SERVICE_IN_USE         NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_XPCOM, 23)
-// Observing xpcom autoregistration.  Topics will be 'start' and 'stop'.
-#define NS_XPCOM_AUTOREGISTRATION_OBSERVER_ID "xpcom-autoregistration"
-#ifdef MOZILLA_INTERNAL_API
-#include "nsXPCOM.h"
-#include "nsServiceManagerUtils.h"
-#include "nsIServiceManagerObsolete.h"
-#endif
-
-#endif /* __gen_nsIServiceManager_h__ */
diff --git a/third_party/mozilla/include/nsISupports.h b/third_party/mozilla/include/nsISupports.h
deleted file mode 100644
index 14221e7..0000000
--- a/third_party/mozilla/include/nsISupports.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * DO NOT EDIT.  THIS FILE IS GENERATED FROM c:/builds/tinderbox/XR-Mozilla1.8.0-Release/WINNT_5.2_Depend/mozilla/xpcom/base/nsISupports.idl
- */
-
-#ifndef __gen_nsISupports_h__
-#define __gen_nsISupports_h__
-
-
-#ifndef __gen_nsrootidl_h__
-#include "nsrootidl.h"
-#endif
-
-/* For IDL files that don't want to include root IDL files. */
-#ifndef NS_NO_VTABLE
-#define NS_NO_VTABLE
-#endif
-/* 
- * Start commenting out the C++ versions of the below in the output header
- */
-#if 0
-
-/* starting interface:    nsISupports */
-#define NS_ISUPPORTS_IID_STR "00000000-0000-0000-c000-000000000046"
-
-#define NS_ISUPPORTS_IID \
-  {0x00000000, 0x0000, 0x0000, \
-    { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 }}
-
-class NS_NO_VTABLE nsISupports {
- public: 
-
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISUPPORTS_IID)
-
-  /* void QueryInterface (in nsIIDRef uuid, [iid_is (uuid), retval] out nsQIResult result); */
-  NS_IMETHOD QueryInterface(const nsIID & uuid, void * *result) = 0;
-
-  /* [noscript, notxpcom] nsrefcnt AddRef (); */
-  NS_IMETHOD_(nsrefcnt) AddRef(void) = 0;
-
-  /* [noscript, notxpcom] nsrefcnt Release (); */
-  NS_IMETHOD_(nsrefcnt) Release(void) = 0;
-
-};
-
-/* Use this macro when declaring classes that implement this interface. */
-#define NS_DECL_NSISUPPORTS \
-  NS_IMETHOD QueryInterface(const nsIID & uuid, void * *result); \
-  NS_IMETHOD_(nsrefcnt) AddRef(void); \
-  NS_IMETHOD_(nsrefcnt) Release(void); 
-
-/* Use this macro to declare functions that forward the behavior of this interface to another object. */
-#define NS_FORWARD_NSISUPPORTS(_to) \
-  NS_IMETHOD QueryInterface(const nsIID & uuid, void * *result) { return _to QueryInterface(uuid, result); } \
-  NS_IMETHOD_(nsrefcnt) AddRef(void) { return _to AddRef(); } \
-  NS_IMETHOD_(nsrefcnt) Release(void) { return _to Release(); } 
-
-/* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
-#define NS_FORWARD_SAFE_NSISUPPORTS(_to) \
-  NS_IMETHOD QueryInterface(const nsIID & uuid, void * *result) { return !_to ? NS_ERROR_NULL_POINTER : _to->QueryInterface(uuid, result); } \
-  NS_IMETHOD_(nsrefcnt) AddRef(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->AddRef(); } \
-  NS_IMETHOD_(nsrefcnt) Release(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Release(); } 
-
-#if 0
-/* Use the code below as a template for the implementation class for this interface. */
-
-/* Header file */
-class nsSupports : public nsISupports
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISUPPORTS
-
-  nsSupports();
-
-private:
-  ~nsSupports();
-
-protected:
-  /* additional members */
-};
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS1(nsSupports, nsISupports)
-
-nsSupports::nsSupports()
-{
-  /* member initializers and constructor code */
-}
-
-nsSupports::~nsSupports()
-{
-  /* destructor code */
-}
-
-/* void QueryInterface (in nsIIDRef uuid, [iid_is (uuid), retval] out nsQIResult result); */
-NS_IMETHODIMP nsSupports::QueryInterface(const nsIID & uuid, void * *result)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* [noscript, notxpcom] nsrefcnt AddRef (); */
-NS_IMETHODIMP_(nsrefcnt) nsSupports::AddRef()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* [noscript, notxpcom] nsrefcnt Release (); */
-NS_IMETHODIMP_(nsrefcnt) nsSupports::Release()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* End of implementation class template. */
-#endif
-
-/* 
- * End commenting out the C++ versions of the above in the output header
- */
-#endif
-
-#include "nsISupportsBase.h"
-
-// Begin Google Modified
-
-//#include "nsISupportsUtils.h"
-
-// End Google Modified
-
-#endif /* __gen_nsISupports_h__ */
diff --git a/third_party/mozilla/include/nsISupportsBase.h b/third_party/mozilla/include/nsISupportsBase.h
deleted file mode 100644
index bea876f..0000000
--- a/third_party/mozilla/include/nsISupportsBase.h
+++ /dev/null
@@ -1,119 +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 XPCOM.
- *
- * The Initial Developer of the Original Code is Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * 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 ***** */
-
-#ifndef nsISupportsBase_h__
-#define nsISupportsBase_h__
-
-#ifndef nscore_h___
-#include "nscore.h"
-#endif
-
-#ifndef nsID_h__
-#include "nsID.h"
-#endif
-
-
-/*@{*/
-/**
- * IID for the nsISupports interface
- * {00000000-0000-0000-c000-000000000046}
- *
- * To maintain binary compatibility with COM's IUnknown, we define the IID
- * of nsISupports to be the same as that of COM's IUnknown.
- */
-#define NS_ISUPPORTS_IID                                                      \
-  { 0x00000000, 0x0000, 0x0000,                                               \
-    {0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }
-
-/**
- * Reference count values
- *
- * This is the return type for AddRef() and Release() in nsISupports.
- * IUnknown of COM returns an unsigned long from equivalent functions.
- * The following ifdef exists to maintain binary compatibility with
- * IUnknown.
- */
-#if defined(XP_WIN) && PR_BYTES_PER_LONG == 4
-typedef unsigned long nsrefcnt;
-#else
-typedef PRUint32 nsrefcnt;
-#endif
-
-/**
- * Basic component object model interface. Objects which implement
- * this interface support runtime interface discovery (QueryInterface)
- * and a reference counted memory model (AddRef/Release). This is
- * modelled after the win32 IUnknown API.
- */
-class NS_NO_VTABLE nsISupports {
-public:
-
-  /**
-   * @name Methods
-   */
-
-  //@{
-  /**
-   * A run time mechanism for interface discovery.
-   * @param aIID [in] A requested interface IID
-   * @param aInstancePtr [out] A pointer to an interface pointer to
-   * receive the result.
-   * @return <b>NS_OK</b> if the interface is supported by the associated
-   * instance, <b>NS_NOINTERFACE</b> if it is not.
-   * <b>NS_ERROR_INVALID_POINTER</b> if <i>aInstancePtr</i> is <b>NULL</b>.
-   */
-  NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) = 0;
-  /**
-   * Increases the reference count for this interface.
-   * The associated instance will not be deleted unless
-   * the reference count is returned to zero.
-   *
-   * @return The resulting reference count.
-   */
-  NS_IMETHOD_(nsrefcnt) AddRef(void) = 0;
-
-  /**
-   * Decreases the reference count for this interface.
-   * Generally, if the reference count returns to zero,
-   * the associated instance is deleted.
-   *
-   * @return The resulting reference count.
-   */
-  NS_IMETHOD_(nsrefcnt) Release(void) = 0;
-
-  //@}
-};
-/*@}*/
-#endif
diff --git a/third_party/mozilla/include/nscore.h b/third_party/mozilla/include/nscore.h
deleted file mode 100644
index c8c4744..0000000
--- a/third_party/mozilla/include/nscore.h
+++ /dev/null
@@ -1,455 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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 of 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 ***** */
-#ifndef nscore_h___
-#define nscore_h___
-
-/**
- * Make sure that we have the proper platform specific 
- * c++ definitions needed by nscore.h
- */
-#ifndef _XPCOM_CONFIG_H_
-#include "xpcom-config.h"
-#endif
-
-/**
- * Incorporate the core NSPR data types which XPCOM uses.
- */
-#include "prtypes.h"
-
-/* Core XPCOM declarations. */
-
-/**
- * Macros defining the target platform...
- */
-#ifdef _WIN32
-#define NS_WIN32 1
-
-#elif defined(__unix)
-#define NS_UNIX 1
-
-#elif defined(XP_OS2)
-#define NS_OS2 1
-#endif
-/*----------------------------------------------------------------------*/
-/* Import/export defines */
-
-/**
- * Using the visibility("hidden") attribute allows the compiler to use
- * PC-relative addressing to call this function.  If a function does not
- * access any global data, and does not call any methods which are not either
- * file-local or hidden, then on ELF systems we avoid loading the address of
- * the PLT into a register at the start of the function, which reduces code
- * size and frees up a register for general use.
- *
- * As a general rule, this should be used for any non-exported symbol
- * (including virtual method implementations).  NS_IMETHOD uses this by
- * default; if you need to have your NS_IMETHOD functions exported, you can
- * wrap your class as follows:
- *
- * #undef  IMETHOD_VISIBILITY
- * #define IMETHOD_VISIBILITY NS_VISIBILITY_DEFAULT
- *
- * class Foo {
- * ...
- * };
- *
- * #undef  IMETHOD_VISIBILITY
- * #define IMETHOD_VISIBILITY NS_VISIBILITY_HIDDEN
- *
- * Don't forget to change the visibility back to hidden before the end
- * of a header!
- *
- * Other examples:
- *
- * NS_HIDDEN_(int) someMethod();
- * SomeCtor() NS_HIDDEN;
- */
-
-#ifdef HAVE_VISIBILITY_HIDDEN_ATTRIBUTE
-#define NS_VISIBILITY_HIDDEN   __attribute__ ((visibility ("hidden")))
-#else
-#define NS_VISIBILITY_HIDDEN
-#endif
-
-#if defined(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) && defined(HAVE_VISIBILITY_PRAGMA)
-#define NS_VISIBILITY_DEFAULT __attribute__ ((visibility ("default")))
-#else
-#define NS_VISIBILITY_DEFAULT
-#endif
-
-#define NS_HIDDEN_(type)   NS_VISIBILITY_HIDDEN type
-#define NS_EXTERNAL_VIS_(type) NS_VISIBILITY_DEFAULT type
-
-#define NS_HIDDEN           NS_VISIBILITY_HIDDEN
-#define NS_EXTERNAL_VIS     NS_VISIBILITY_DEFAULT
-
-#undef  IMETHOD_VISIBILITY
-#define IMETHOD_VISIBILITY  NS_VISIBILITY_HIDDEN
-
-/**
- * Mark a function as using a potentially non-standard function calling
- * convention.  This can be used on functions that are called very
- * frequently, to reduce the overhead of the function call.  It is still worth
- * using the macro for C++ functions which take no parameters since it allows
- * passing |this| in a register.
- *
- *  - Do not use this on any scriptable interface method since xptcall won't be
- *    aware of the different calling convention.
- *  - This must appear on the declaration, not the definition.
- *  - Adding this to a public function _will_ break binary compatibility.
- *  - This may be used on virtual functions but you must ensure it is applied
- *    to all implementations - the compiler will _not_ warn but it will crash.
- *  - This has no effect for inline functions or functions which take a
- *    variable number of arguments.
- *
- * Examples: int NS_FASTCALL func1(char *foo);
- *           NS_HIDDEN_(int) NS_FASTCALL func2(char *foo);
- */
-
-#if defined(__i386__) && defined(__GNUC__) && (__GNUC__ >= 3) && !defined(XP_OS2)
-#define NS_FASTCALL __attribute__ ((regparm (3), stdcall))
-#else
-#define NS_FASTCALL
-#endif
-
-/*
- * NS_DEFCALL undoes the effect of a global regparm/stdcall setting
- * so that xptcall works correctly.
- */
-#if defined(__i386__) && defined(__GNUC__) && (__GNUC__ >= 3) && !defined(XP_OS2)
-#define NS_DEFCALL __attribute__ ((regparm (0), cdecl))
-#else
-#define NS_DEFCALL
-#endif
-
-#ifdef NS_WIN32
-
-#define NS_IMPORT __declspec(dllimport)
-#define NS_IMPORT_(type) type __declspec(dllimport) __stdcall
-#define NS_EXPORT __declspec(dllexport)
-#define NS_EXPORT_(type) type __declspec(dllexport) __stdcall
-#define NS_IMETHOD_(type) virtual type __stdcall
-#define NS_IMETHODIMP_(type) type __stdcall
-#define NS_METHOD_(type) type __stdcall
-#define NS_CALLBACK_(_type, _name) _type (__stdcall * _name)
-#define NS_STDCALL __stdcall
-
-/*
-  These are needed to mark static members in exported classes, due to
-  gcc bug XXX insert bug# here.
- */
-
-#define NS_EXPORT_STATIC_MEMBER_(type) type
-#define NS_IMPORT_STATIC_MEMBER_(type) type
-
-#else
-
-#define NS_IMPORT NS_EXTERNAL_VIS
-#define NS_IMPORT_(type) NS_EXTERNAL_VIS_(type)
-#define NS_EXPORT NS_EXTERNAL_VIS
-#define NS_EXPORT_(type) NS_EXTERNAL_VIS_(type)
-#define NS_IMETHOD_(type) virtual IMETHOD_VISIBILITY type NS_DEFCALL
-#define NS_IMETHODIMP_(type) type
-#define NS_METHOD_(type) type
-#define NS_CALLBACK_(_type, _name) _type (* _name)
-#define NS_STDCALL
-#define NS_EXPORT_STATIC_MEMBER_(type) NS_EXTERNAL_VIS_(type)
-#define NS_IMPORT_STATIC_MEMBER_(type) NS_EXTERNAL_VIS_(type)
-
-#endif
-
-/**
- * Macro for creating typedefs for pointer-to-member types which are
- * declared with stdcall.  It is important to use this for any type which is
- * declared as stdcall (i.e. NS_IMETHOD).  For example, instead of writing:
- *
- *  typedef nsresult (nsIFoo::*someType)(nsISupports* arg);
- *
- *  you should write:
- *
- *  typedef
- *  NS_STDCALL_FUNCPROTO(nsresult, someType, nsIFoo, typeFunc, (nsISupports*));
- *
- *  where nsIFoo::typeFunc is any method declared as
- *  NS_IMETHOD typeFunc(nsISupports*);
- *
- *  XXX this can be simplified to always use the non-typeof implementation
- *  when http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11893 is fixed.
- */
-
-#ifdef __GNUC__
-#define NS_STDCALL_FUNCPROTO(ret, name, class, func, args) \
-  typeof(&class::func) name
-#else
-#define NS_STDCALL_FUNCPROTO(ret, name, class, func, args) \
-  ret (NS_STDCALL class::*name) args
-#endif
-
-/**
- * Generic API modifiers which return the standard XPCOM nsresult type
- */
-#define NS_IMETHOD          NS_IMETHOD_(nsresult)
-#define NS_IMETHODIMP       NS_IMETHODIMP_(nsresult)
-#define NS_METHOD           NS_METHOD_(nsresult)
-#define NS_CALLBACK(_name)  NS_CALLBACK_(nsresult, _name)
-
-/**
- * Import/Export macros for XPCOM APIs
- */
-
-#ifdef _IMPL_NS_COM
-#define NS_COM NS_EXPORT
-#elif  _IMPL_NS_COM_OFF
-#define NS_COM
-#elif  XPCOM_GLUE
-#define NS_COM
-#else
-#define NS_COM NS_IMPORT
-#endif
-
-#ifdef MOZILLA_INTERNAL_API
-#  define NS_COM_GLUE NS_COM
-   /*
-     The frozen string API has different definitions of nsAC?String
-     classes than the internal API. On systems that explicitly declare
-     dllexport symbols this is not a problem, but on ELF systems
-     internal symbols can accidentally "shine through"; we rename the
-     internal classes to avoid symbol conflicts.
-   */
-#  define nsAString nsAString_internal
-#  define nsACString nsACString_internal
-#else
-#  define NS_COM_GLUE
-#endif
-
-
-/**
- * NS_NO_VTABLE is emitted by xpidl in interface declarations whenever
- * xpidl can determine that the interface can't contain a constructor.
- * This results in some space savings and possible runtime savings -
- * see bug 49416.  We undefine it first, as xpidl-generated headers
- * define it for IDL uses that don't include this file.
- */
-#ifdef NS_NO_VTABLE
-#undef NS_NO_VTABLE
-#endif
-#if defined(_MSC_VER) && _MSC_VER >= 1100
-#define NS_NO_VTABLE __declspec(novtable)
-#else
-#define NS_NO_VTABLE
-#endif
-
-
-/**
- * Generic XPCOM result data type
- */
-typedef PRUint32 nsresult;
-
-/**
- * The preferred symbol for null.
- */
-#define nsnull 0
-
-#include "nsError.h"
-
-/* ------------------------------------------------------------------------ */
-/* Casting macros for hiding C++ features from older compilers */
-
-  /*
-    All our compiler support template specialization, but not all support the
-    |template <>| notation.  The compiler that don't understand this notation
-    just omit it for specialization.
-
-    Need to add an autoconf test for this.
-  */
-
-  /* under Metrowerks (Mac), we don't have autoconf yet */
-#ifdef __MWERKS__
-  #define HAVE_CPP_PARTIAL_SPECIALIZATION
-  #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
-
-  #define HAVE_CPP_ACCESS_CHANGING_USING
-  #define HAVE_CPP_AMBIGUITY_RESOLVING_USING
-  #define HAVE_CPP_EXPLICIT
-  #define HAVE_CPP_TYPENAME
-  #define HAVE_CPP_BOOL
-  #define HAVE_CPP_NAMESPACE_STD
-  #define HAVE_CPP_UNAMBIGUOUS_STD_NOTEQUAL
-  #define HAVE_CPP_2BYTE_WCHAR_T
-#endif
-
-  /* under VC++ (Windows), we don't have autoconf yet */
-#if defined(_MSC_VER) && (_MSC_VER>=1100)
-  /* VC++ 5.0 and greater implement template specialization, 4.2 is unknown */
-  #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
-
-  #define HAVE_CPP_EXPLICIT
-  #define HAVE_CPP_TYPENAME
-  #define HAVE_CPP_ACCESS_CHANGING_USING
-
-  #if (_MSC_VER==1100)
-      /* VC++5.0 has an internal compiler error (sometimes) without this */
-    #undef HAVE_CPP_ACCESS_CHANGING_USING
-  #endif
-
-  #define HAVE_CPP_NAMESPACE_STD
-  #define HAVE_CPP_UNAMBIGUOUS_STD_NOTEQUAL
-  #define HAVE_CPP_2BYTE_WCHAR_T
-#endif
-
-#ifndef __PRUNICHAR__
-#define __PRUNICHAR__
-  /* For now, don't use wchar_t on Unix because it breaks the Netscape
-   * commercial build.  When this is fixed there will be no need for the
-   * |NS_REINTERPRET_CAST| in nsLiteralString.h either.
-   */
-  #if defined(HAVE_CPP_2BYTE_WCHAR_T) && defined(NS_WIN32)
-    typedef wchar_t PRUnichar;
-  #else
-    typedef PRUint16 PRUnichar;
-  #endif
-#endif
-
-  /*
-    If the compiler doesn't support |explicit|, we'll just make it go away, trusting
-    that the builds under compilers that do have it will keep us on the straight and narrow.
-  */
-#ifndef HAVE_CPP_EXPLICIT
-  #define explicit
-#endif
-
-#ifndef HAVE_CPP_TYPENAME
-  #define typename
-#endif
-
-#ifdef HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
-  #define NS_SPECIALIZE_TEMPLATE  template <>
-#else
-  #define NS_SPECIALIZE_TEMPLATE
-#endif
-
-/* unix and beos now determine this automatically */
-#if ! defined XP_UNIX && ! defined XP_BEOS && !defined(XP_OS2)
-#ifndef HAVE_CPP_NEW_CASTS
-#define HAVE_CPP_NEW_CASTS 1 /* we'll be optimistic. */
-#endif
-#endif
-
-#if defined(HAVE_CPP_NEW_CASTS)
-#define NS_STATIC_CAST(__type, __ptr)      static_cast< __type >(__ptr)
-#define NS_CONST_CAST(__type, __ptr)       const_cast< __type >(__ptr)
-
-#define NS_REINTERPRET_POINTER_CAST(__type, __ptr)    reinterpret_cast< __type >(__ptr)
-#define NS_REINTERPRET_NONPOINTER_CAST(__type, __obj) reinterpret_cast< __type >(__obj)
-#define NS_REINTERPRET_CAST(__type, __expr)           reinterpret_cast< __type >(__expr)
-
-#else
-#define NS_STATIC_CAST(__type, __ptr)      ((__type)(__ptr))
-#define NS_CONST_CAST(__type, __ptr)       ((__type)(__ptr))
-
-#define NS_REINTERPRET_POINTER_CAST(__type, __ptr)     ((__type)((void*)(__ptr)))
-#define NS_REINTERPRET_NONPOINTER_CAST(__type, __obj)  ((__type)(__obj))
-
-  /* Note: the following is only appropriate for pointers. */
-#define NS_REINTERPRET_CAST(__type, __expr)            NS_REINTERPRET_POINTER_CAST(__type, __expr)
-  /*
-    Why cast to a |void*| first?  Well, when old-style casting from
-    a pointer to a base to a pointer to a derived class, the cast will be
-    ambiguous if the source pointer type appears multiple times in the
-    destination, e.g.,
-    
-      class Base {};
-      class Derived : public Base, public Base {};
-      
-      void foo( Base* b )
-        {
-          ((Derived*)b)->some_derived_member ... // Error: Ambiguous, expand from which |Base|?
-        }
-
-    an old-style cast (like |static_cast|) will change the pointer, but
-    here, doesn't know how.  The cast to |void*| prevents it from thinking
-    it needs to expand the original pointer.
-
-    The cost is, |NS_REINTERPRET_CAST| is no longer appropriate for non-pointer
-    conversions.  Also, mis-applying |NS_REINTERPRET_CAST| to cast |this| to something
-    will still expand the pointer to the outer object in standards complying compilers.
-  */
-
-  /*
-    No sense in making an NS_DYNAMIC_CAST() macro: you can't duplicate
-    the semantics. So if you want to dynamic_cast, then just use it
-    "straight", no macro.
-  */
-#endif
- 
-/* 
- * Use these macros to do 64bit safe pointer conversions.
- */
-
-#define NS_PTR_TO_INT32(x)  ((PRInt32)  (PRWord) (x))
-#define NS_PTR_TO_UINT32(x) ((PRUint32) (PRWord) (x))
-#define NS_INT32_TO_PTR(x)  ((void *)   (PRWord) (x))
-
-/*
- * Use NS_STRINGIFY to form a string literal from the value of a macro.
- */
-#define NS_STRINGIFY_HELPER(x_) #x_
-#define NS_STRINGIFY(x_) NS_STRINGIFY_HELPER(x_)
-
-/*
- * These macros allow you to give a hint to the compiler about branch
- * probability so that it can better optimize.  Use them like this:
- *
- *  if (NS_LIKELY(v == 1)) {
- *    ... expected code path ...
- *  }
- *
- *  if (NS_UNLIKELY(v == 0)) {
- *    ... non-expected code path ...
- *  }
- *
- */
-
-#if defined(__GNUC__) && (__GNUC__ > 2)
-#define NS_LIKELY(x)    (__builtin_expect((x), 1))
-#define NS_UNLIKELY(x)  (__builtin_expect((x), 0))
-#else
-#define NS_LIKELY(x)    (x)
-#define NS_UNLIKELY(x)  (x)
-#endif
-
-#endif /* nscore_h___ */
diff --git a/third_party/mozilla/include/nsplugindefs.h b/third_party/mozilla/include/nsplugindefs.h
deleted file mode 100644
index 86781ca..0000000
--- a/third_party/mozilla/include/nsplugindefs.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** 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 ***** */
-
-#ifndef nsplugindefs_h___
-#define nsplugindefs_h___
-
-#if defined(XP_OS2) || defined(__OS2__)
-#define INCL_BASE
-#define INCL_PM
-#include <os2.h>
-#pragma pack(1)
-#endif
-
-#ifndef prtypes_h___
-#include "prtypes.h"
-#endif
-
-#if defined(XP_MAC) || defined(XP_MACOSX)
-#   include <Quickdraw.h>
-#   include <Events.h>
-#   include <MacWindows.h>
-#endif
-
-#if defined(XP_UNIX) && defined(MOZ_X11)
-#   include <X11/Xlib.h>
-#   include <X11/Xutil.h>
-#endif
-
-#if defined(XP_WIN)
-#   include <windef.h>
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-/* The OS/2 version of Netscape uses RC_DATA to define the
-   mime types, file extensions, etc that are required.
-   Use a vertical bar to separate types, end types with \0.
-   FileVersion and ProductVersion are 32bit ints, all other
-   entries are strings the MUST be terminated wwith a \0.
-
-AN EXAMPLE:
-
-RCDATA NS_INFO_ProductVersion { 1,0,0,1,}
-
-RCDATA NS_INFO_MIMEType    { "video/x-video|",
-                             "video/x-flick\0" }
-RCDATA NS_INFO_FileExtents { "avi|",
-                             "flc\0" }
-RCDATA NS_INFO_FileOpenName{ "MMOS2 video player(*.avi)|",
-                             "MMOS2 Flc/Fli player(*.flc)\0" }
-
-RCDATA NS_INFO_FileVersion       { 1,0,0,1 }
-RCDATA NS_INFO_CompanyName       { "Netscape Communications\0" }
-RCDATA NS_INFO_FileDescription   { "NPAVI32 Extension DLL\0"
-RCDATA NS_INFO_InternalName      { "NPAVI32\0" )
-RCDATA NS_INFO_LegalCopyright    { "Copyright Netscape Communications \251 1996\0"
-RCDATA NS_INFO_OriginalFilename  { "NVAPI32.DLL" }
-RCDATA NS_INFO_ProductName       { "NPAVI32 Dynamic Link Library\0" }
-
-*/
-
-
-/* RC_DATA types for version info - required */
-#define NS_INFO_ProductVersion      1
-#define NS_INFO_MIMEType            2
-#define NS_INFO_FileOpenName        3
-#define NS_INFO_FileExtents         4
-
-/* RC_DATA types for version info - used if found */
-#define NS_INFO_FileDescription     5
-#define NS_INFO_ProductName         6
-
-/* RC_DATA types for version info - optional */
-#define NS_INFO_CompanyName         7
-#define NS_INFO_FileVersion         8
-#define NS_INFO_InternalName        9
-#define NS_INFO_LegalCopyright      10
-#define NS_INFO_OriginalFilename    11
-
-#ifndef RC_INVOKED
-
-////////////////////////////////////////////////////////////////////////////////
-// Structures and definitions
-
-#ifdef XP_MAC
-#pragma options align=mac68k
-#endif
-
-typedef const char*     nsMIMEType;
-
-struct nsByteRange {
-    PRInt32             offset; 	/* negative offset means from the end */
-    PRUint32            length;
-    struct nsByteRange* next;
-};
-
-struct nsPluginRect {
-    PRUint16            top;
-    PRUint16            left;
-    PRUint16            bottom;
-    PRUint16            right;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Unix specific structures and definitions
-
-#ifdef XP_UNIX
-
-#include <stdio.h>
-
-/*
- * Callback Structures.
- *
- * These are used to pass additional platform specific information.
- */
-enum nsPluginCallbackType {
-    nsPluginCallbackType_SetWindow = 1,
-    nsPluginCallbackType_Print
-};
-
-struct nsPluginAnyCallbackStruct {
-    PRInt32     type;
-};
-
-#ifdef MOZ_X11
-struct nsPluginSetWindowCallbackStruct {
-    PRInt32     type;
-    Display*    display;
-    Visual*     visual;
-    Colormap    colormap;
-    PRUint32    depth;
-};
-#else
-struct nsPluginSetWindowCallbackStruct {
-    PRInt32     type;
-};
-#endif
-
-
-struct nsPluginPrintCallbackStruct {
-    PRInt32     type;
-    FILE*       fp;
-};
-
-#endif /* XP_UNIX */
-
-////////////////////////////////////////////////////////////////////////////////
-
-// List of variables which should be implmented by the plugin
-enum nsPluginVariable {
-    nsPluginVariable_NameString                      = 1,
-    nsPluginVariable_DescriptionString               = 2
-};
-
-enum nsPluginManagerVariable {
-    nsPluginManagerVariable_XDisplay                 = 1,
-    nsPluginManagerVariable_XtAppContext             = 2,
-    nsPluginManagerVariable_SupportsXEmbed            = 14
-};
-
-enum nsPluginInstancePeerVariable {
-    nsPluginInstancePeerVariable_NetscapeWindow      = 3
-//    nsPluginInstancePeerVariable_JavaClass              = 5,
-//    nsPluginInstancePeerVariable_TimerInterval          = 7
-};
-
-enum nsPluginInstanceVariable {
-    nsPluginInstanceVariable_WindowlessBool          = 3,
-    nsPluginInstanceVariable_TransparentBool         = 4,
-    nsPluginInstanceVariable_DoCacheBool             = 5,
-    nsPluginInstanceVariable_CallSetWindowAfterDestroyBool = 6,
-    nsPluginInstanceVariable_ScriptableInstance      = 10,
-    nsPluginInstanceVariable_ScriptableIID           = 11,
-    nsPluginInstanceVariable_NeedsXEmbed             = 14
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-enum nsPluginMode {
-    nsPluginMode_Embedded = 1,
-    nsPluginMode_Full
-};
-
-// XXX this can go away now
-enum nsPluginStreamType {
-    nsPluginStreamType_Normal = 1,
-    nsPluginStreamType_Seek,
-    nsPluginStreamType_AsFile,
-    nsPluginStreamType_AsFileOnly
-};
-
-/*
- * The type of a nsPluginWindow - it specifies the type of the data structure
- * returned in the window field.
- */
-enum nsPluginWindowType {
-    nsPluginWindowType_Window = 1,
-    nsPluginWindowType_Drawable
-};
-
-#if defined(XP_MAC) || defined(XP_MACOSX)
-
-struct nsPluginPort {
-    CGrafPtr     port;   /* Grafport */
-    PRInt32     portx;  /* position inside the topmost window */
-    PRInt32     porty;
-};
-typedef RgnHandle       nsPluginRegion;
-typedef WindowRef       nsPluginPlatformWindowRef;
-
-#elif defined(XP_WIN) || defined(XP_OS2)
-
-struct nsPluginPort;
-typedef HRGN            nsPluginRegion;
-typedef HWND            nsPluginPlatformWindowRef;
-
-#elif defined(XP_UNIX) && defined(MOZ_X11)
-
-struct nsPluginPort;
-typedef Region          nsPluginRegion;
-typedef Drawable        nsPluginPlatformWindowRef;
-
-#else
-
-struct nsPluginPort;
-typedef void*           nsPluginRegion;
-typedef void*           nsPluginPlatformWindowRef;
-
-#endif
-
-struct nsPluginWindow {
-    nsPluginPort* window;       /* Platform specific window handle */
-                                /* OS/2: x - Position of bottom left corner  */
-                                /* OS/2: y - relative to visible netscape window */
-    PRInt32       x;            /* Position of top left corner relative */
-    PRInt32       y;            /*	to a netscape page.					*/
-    PRUint32      width;        /* Maximum window size */
-    PRUint32      height;
-    nsPluginRect  clipRect;     /* Clipping rectangle in port coordinates */
-                                /* Used by MAC only.			  */
-#if defined(XP_UNIX) && !defined(XP_MACOSX)
-    void*         ws_info;      /* Platform-dependent additonal data */
-#endif /* XP_UNIX */
-    nsPluginWindowType type;    /* Is this a window or a drawable? */
-};
-
-struct nsPluginFullPrint {
-    PRBool      pluginPrinted;	/* Set TRUE if plugin handled fullscreen */
-                                /*	printing							 */
-    PRBool      printOne;       /* TRUE if plugin should print one copy  */
-                                /*	to default printer					 */
-    void*       platformPrint;  /* Platform-specific printing info */
-};
-
-struct nsPluginEmbedPrint {
-    nsPluginWindow    window;
-    void*             platformPrint;	/* Platform-specific printing info */
-};
-
-struct nsPluginPrint {
-    PRUint16                  mode;         /* nsPluginMode_Full or nsPluginMode_Embedded */
-    union
-    {
-        nsPluginFullPrint     fullPrint;	/* if mode is nsPluginMode_Full */
-        nsPluginEmbedPrint    embedPrint;	/* if mode is nsPluginMode_Embedded */
-    } print;
-};
-
-struct nsPluginEvent {
-
-#if defined(XP_MAC) || defined(XP_MACOSX)
-    EventRecord*                event;
-    nsPluginPlatformWindowRef   window;
-
-#elif defined(XP_OS2)
-    uint32      event;
-    uint32      wParam;
-    uint32      lParam;
-
-#elif defined(XP_WIN)
-    uint16      event;
-    uint32      wParam;
-    uint32      lParam;
-
-#elif defined(XP_UNIX) && defined(MOZ_X11)
-    XEvent      event;
-#else
-    void        *event;
-#endif
-};
-
-/*
- *  Non-standard event types that can be passed to HandleEvent
- *  (These need to be kept in sync with the events defined in npapi.h.)
- */
-enum nsPluginEventType {
-#if defined(XP_MAC) || defined(XP_MACOSX)
-    nsPluginEventType_GetFocusEvent = (osEvt + 16),
-    nsPluginEventType_LoseFocusEvent,
-    nsPluginEventType_AdjustCursorEvent,
-    nsPluginEventType_MenuCommandEvent,
-    nsPluginEventType_ClippingChangedEvent,
-    nsPluginEventType_ScrollingBeginsEvent,
-    nsPluginEventType_ScrollingEndsEvent,
-#endif /* XP_MAC || XP_MACOSX */
-    nsPluginEventType_Idle                 = 0
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-enum nsPluginReason {
-    nsPluginReason_Base = 0,
-    nsPluginReason_Done = 0,
-    nsPluginReason_NetworkErr,
-    nsPluginReason_UserBreak,
-    nsPluginReason_NoReason
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Version Numbers for Structs
-
-// These version number are for structures whose fields may evolve over time.
-// When fields are added to the end of the struct, the minor version will be
-// incremented. When the struct changes in an incompatible way the major version
-// will be incremented. 
-
-#define nsMajorVersion(v)       (((PRInt32)(v) >> 16) & 0xffff)
-#define nsMinorVersion(v)       ((PRInt32)(v) & 0xffff)
-
-#define nsVersionOK(suppliedV, requiredV)                   \
-    (nsMajorVersion(suppliedV) == nsMajorVersion(requiredV) \
-     && nsMinorVersion(suppliedV) >= nsMinorVersion(requiredV))
-
-#define NP_POPUP_API_VERSION 16
-
-////////////////////////////////////////////////////////////////////////////////
-// Classes
-////////////////////////////////////////////////////////////////////////////////
-
-// Classes that must be implemented by the plugin DLL:
-class nsIPlugin;                        // plugin class (MIME-type handler)
-class nsIEventHandler;                  // event handler interface
-class nsIPluginInstance;                // plugin instance
-
-// Classes that are implemented by the browser:
-class nsIPluginManager;                 // minimum browser requirements
-class nsIFileUtilities;                 // file utilities (accessible from nsIPluginManager)
-class nsIPluginInstancePeer;            // parts of nsIPluginInstance implemented by the browser
-class nsIWindowlessPluginInstancePeer;  // subclass of nsIPluginInstancePeer for windowless plugins
-class nsIPluginTagInfo;                 // describes html tag (accessible from nsIPluginInstancePeer)
-////////////////////////////////////////////////////////////////////////////////
-
-#ifdef XP_MAC
-#pragma options align=reset
-#endif
-
-#endif /* RC_INVOKED */
-#ifdef __OS2__
-#pragma pack()
-#endif
-
-#endif // nsplugindefs_h___
diff --git a/third_party/mozilla/include/nspluginroot.h b/third_party/mozilla/include/nspluginroot.h
deleted file mode 100644
index 4bb7b0d..0000000
--- a/third_party/mozilla/include/nspluginroot.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * DO NOT EDIT.  THIS FILE IS GENERATED FROM d:/projects/mozilla_1_8_0_branch/mozilla/modules/plugin/base/public/nspluginroot.idl
- */
-
-#ifndef __gen_nspluginroot_h__
-#define __gen_nspluginroot_h__
-/* For IDL files that don't want to include root IDL files. */
-#ifndef NS_NO_VTABLE
-#define NS_NO_VTABLE
-#endif
-
-#endif /* __gen_nspluginroot_h__ */
diff --git a/third_party/mozilla/include/nsrootidl.h b/third_party/mozilla/include/nsrootidl.h
deleted file mode 100644
index eefce76..0000000
--- a/third_party/mozilla/include/nsrootidl.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * DO NOT EDIT.  THIS FILE IS GENERATED FROM c:/builds/tinderbox/XR-Mozilla1.8.0-Release/WINNT_5.2_Depend/mozilla/xpcom/base/nsrootidl.idl
- */
-
-#ifndef __gen_nsrootidl_h__
-#define __gen_nsrootidl_h__
-/* For IDL files that don't want to include root IDL files. */
-#ifndef NS_NO_VTABLE
-#define NS_NO_VTABLE
-#endif
-#include "nscore.h"
-#include "prtime.h"
-/*
- * Forward declarations for new string types
- */
-class nsAString;
-class nsACString;
-/* 
- * Start commenting out the C++ versions of the below in the output header
- */
-#if 0
-/**
- * Root idl declarations to be used by all.
- * @status FROZEN
- */
-typedef PRBool PRBool;
-
-typedef PRUint8 PRUint8;
-
-typedef PRUint16 PRUint16;
-
-typedef PRUint16 PRUnichar;
-
-typedef PRUint32 PRUint32;
-
-typedef PRUint64 PRUint64;
-
-typedef PRUint64 PRTime;
-
-typedef PRInt16 PRInt16;
-
-typedef PRInt32 PRInt32;
-
-typedef PRInt64 PRInt64;
-
-typedef PRUint32 nsrefcnt;
-
-typedef PRUint32 nsresult;
-
-typedef PRUint32 size_t;
-
-/* 
- * End commenting out the C++ versions of the above in the output header
- */
-#endif
-
-#endif /* __gen_nsrootidl_h__ */
diff --git a/third_party/mozilla/include/prcpucfg.h b/third_party/mozilla/include/prcpucfg.h
deleted file mode 100644
index 310fff8..0000000
--- a/third_party/mozilla/include/prcpucfg.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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 the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * 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 ***** */
-
-#ifndef nspr_cpucfg___
-#define nspr_cpucfg___
-
-#ifndef XP_PC
-#define XP_PC
-#endif
-
-#ifndef WIN32
-#define WIN32
-#endif
-
-#ifndef WIN95
-#define WIN95
-#endif
-
-#define PR_AF_INET6 23  /* same as AF_INET6 */
-
-#if defined(_M_IX86) || defined(_X86_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_WORD	4
-#define PR_BYTES_PER_DWORD	8
-#define PR_BYTES_PER_DOUBLE 8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_WORD	32
-#define PR_BITS_PER_DWORD	64
-#define PR_BITS_PER_DOUBLE  64
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_WORD_LOG2	5
-#define PR_BITS_PER_DWORD_LOG2	6
-#define PR_BITS_PER_DOUBLE_LOG2 6
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_WORD	4
-#define PR_ALIGN_OF_DWORD	8
-#define PR_ALIGN_OF_DOUBLE  4
-#define PR_ALIGN_OF_POINTER 4
-
-#define PR_BYTES_PER_WORD_LOG2	2
-#define PR_BYTES_PER_DWORD_LOG2	2
-
-#elif defined(_ALPHA_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define PR_BYTES_PER_BYTE   1
-#define PR_BYTES_PER_SHORT  2
-#define PR_BYTES_PER_INT    4
-#define PR_BYTES_PER_INT64  8
-#define PR_BYTES_PER_LONG   4
-#define PR_BYTES_PER_FLOAT  4
-#define PR_BYTES_PER_DOUBLE 8
-#define PR_BYTES_PER_WORD   4
-#define PR_BYTES_PER_DWORD  8
-
-#define PR_BITS_PER_BYTE    8
-#define PR_BITS_PER_SHORT   16
-#define PR_BITS_PER_INT     32
-#define PR_BITS_PER_INT64   64
-#define PR_BITS_PER_LONG    32
-#define PR_BITS_PER_FLOAT   32
-#define PR_BITS_PER_DOUBLE  64
-#define PR_BITS_PER_WORD    32
-
-#define PR_BITS_PER_BYTE_LOG2   3
-#define PR_BITS_PER_SHORT_LOG2  4
-#define PR_BITS_PER_INT_LOG2    5
-#define PR_BITS_PER_INT64_LOG2  6
-#define PR_BITS_PER_LONG_LOG2   5
-#define PR_BITS_PER_FLOAT_LOG2  5
-#define PR_BITS_PER_DOUBLE_LOG2 6
-#define PR_BITS_PER_WORD_LOG2   5
-
-#define PR_BYTES_PER_WORD_LOG2  2
-#define PR_BYTES_PER_DWORD_LOG2 3
-
-#define PR_ALIGN_OF_SHORT   2
-#define PR_ALIGN_OF_INT     4
-#define PR_ALIGN_OF_LONG    4
-#define PR_ALIGN_OF_INT64   8
-#define PR_ALIGN_OF_FLOAT   4
-#define PR_ALIGN_OF_DOUBLE  8
-#define PR_ALIGN_OF_POINTER 4
-
-#else /* defined(_M_IX86) || defined(_X86_) */
-
-#error unknown processor architecture
-
-#endif /* defined(_M_IX86) || defined(_X86_) */
-
-#define HAVE_LONG_LONG
-
-#ifndef NO_NSPR_10_SUPPORT
-
-#define BYTES_PER_BYTE      PR_BYTES_PER_BYTE
-#define BYTES_PER_SHORT     PR_BYTES_PER_SHORT
-#define BYTES_PER_INT       PR_BYTES_PER_INT
-#define BYTES_PER_INT64     PR_BYTES_PER_INT64
-#define BYTES_PER_LONG      PR_BYTES_PER_LONG
-#define BYTES_PER_FLOAT     PR_BYTES_PER_FLOAT
-#define BYTES_PER_DOUBLE    PR_BYTES_PER_DOUBLE
-#define BYTES_PER_WORD      PR_BYTES_PER_WORD
-#define BYTES_PER_DWORD     PR_BYTES_PER_DWORD
-
-#define BITS_PER_BYTE       PR_BITS_PER_BYTE
-#define BITS_PER_SHORT      PR_BITS_PER_SHORT
-#define BITS_PER_INT        PR_BITS_PER_INT
-#define BITS_PER_INT64      PR_BITS_PER_INT64
-#define BITS_PER_LONG       PR_BITS_PER_LONG
-#define BITS_PER_FLOAT      PR_BITS_PER_FLOAT
-#define BITS_PER_DOUBLE     PR_BITS_PER_DOUBLE
-#define BITS_PER_WORD       PR_BITS_PER_WORD
-
-#define BITS_PER_BYTE_LOG2  PR_BITS_PER_BYTE_LOG2
-#define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2
-#define BITS_PER_INT_LOG2   PR_BITS_PER_INT_LOG2
-#define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2
-#define BITS_PER_LONG_LOG2  PR_BITS_PER_LONG_LOG2
-#define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2
-#define BITS_PER_DOUBLE_LOG2    PR_BITS_PER_DOUBLE_LOG2
-#define BITS_PER_WORD_LOG2  PR_BITS_PER_WORD_LOG2
-
-#define ALIGN_OF_SHORT      PR_ALIGN_OF_SHORT
-#define ALIGN_OF_INT        PR_ALIGN_OF_INT
-#define ALIGN_OF_LONG       PR_ALIGN_OF_LONG
-#define ALIGN_OF_INT64      PR_ALIGN_OF_INT64
-#define ALIGN_OF_FLOAT      PR_ALIGN_OF_FLOAT
-#define ALIGN_OF_DOUBLE     PR_ALIGN_OF_DOUBLE
-#define ALIGN_OF_POINTER    PR_ALIGN_OF_POINTER
-#define ALIGN_OF_WORD       PR_ALIGN_OF_WORD
-
-#define BYTES_PER_WORD_LOG2		PR_BYTES_PER_WORD_LOG2
-#define BYTES_PER_DWORD_LOG2    PR_BYTES_PER_DWORD_LOG2
-#define WORDS_PER_DWORD_LOG2    PR_WORDS_PER_DWORD_LOG2
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-#endif /* nspr_cpucfg___ */
diff --git a/third_party/mozilla/include/prlong.h b/third_party/mozilla/include/prlong.h
deleted file mode 100644
index 09b4321..0000000
--- a/third_party/mozilla/include/prlong.h
+++ /dev/null
@@ -1,445 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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 the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * 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 ***** */
-
-/*
-** File:                prlong.h
-** Description: Portable access to 64 bit numerics
-**
-** Long-long (64-bit signed integer type) support. Some C compilers
-** don't support 64 bit integers yet, so we use these macros to
-** support both machines that do and don't.
-**/
-#ifndef prlong_h___
-#define prlong_h___
-
-#include "prtypes.h"
-
-PR_BEGIN_EXTERN_C
-
-/***********************************************************************
-** DEFINES:     LL_MaxInt
-**              LL_MinInt
-**              LL_Zero
-**              LL_MaxUint
-** DESCRIPTION:
-**      Various interesting constants and static variable
-**      initializer
-***********************************************************************/
-#if defined(HAVE_WATCOM_BUG_2)
-PRInt64 __pascal __loadds __export
-    LL_MaxInt(void);
-PRInt64 __pascal __loadds __export
-    LL_MinInt(void);
-PRInt64 __pascal __loadds __export
-    LL_Zero(void);
-PRUint64 __pascal __loadds __export
-    LL_MaxUint(void);
-#else
-NSPR_API(PRInt64) LL_MaxInt(void);
-NSPR_API(PRInt64) LL_MinInt(void);
-NSPR_API(PRInt64) LL_Zero(void);
-NSPR_API(PRUint64) LL_MaxUint(void);
-#endif
-
-#if defined(HAVE_LONG_LONG)
-
-#if PR_BYTES_PER_LONG == 8
-#define LL_MAXINT   9223372036854775807L
-#define LL_MININT   (-LL_MAXINT - 1L)
-#define LL_ZERO     0L
-#define LL_MAXUINT  18446744073709551615UL
-#define LL_INIT(hi, lo)  ((hi ## L << 32) + lo ## L)
-#elif (defined(WIN32) || defined(WIN16)) && !defined(__GNUC__)
-#define LL_MAXINT   9223372036854775807i64
-#define LL_MININT   (-LL_MAXINT - 1i64)
-#define LL_ZERO     0i64
-#define LL_MAXUINT  18446744073709551615ui64
-#define LL_INIT(hi, lo)  ((hi ## i64 << 32) + lo ## i64)
-#else
-#define LL_MAXINT   9223372036854775807LL
-#define LL_MININT   (-LL_MAXINT - 1LL)
-#define LL_ZERO     0LL
-#define LL_MAXUINT  18446744073709551615ULL
-#define LL_INIT(hi, lo)  ((hi ## LL << 32) + lo ## LL)
-#endif
-
-/***********************************************************************
-** MACROS:      LL_*
-** DESCRIPTION:
-**      The following macros define portable access to the 64 bit
-**      math facilities.
-**
-***********************************************************************/
-
-/***********************************************************************
-** MACROS:      LL_<relational operators>
-**
-**  LL_IS_ZERO        Test for zero
-**  LL_EQ             Test for equality
-**  LL_NE             Test for inequality
-**  LL_GE_ZERO        Test for zero or positive
-**  LL_CMP            Compare two values
-***********************************************************************/
-#define LL_IS_ZERO(a)       ((a) == 0)
-#define LL_EQ(a, b)         ((a) == (b))
-#define LL_NE(a, b)         ((a) != (b))
-#define LL_GE_ZERO(a)       ((a) >= 0)
-#define LL_CMP(a, op, b)    ((PRInt64)(a) op (PRInt64)(b))
-#define LL_UCMP(a, op, b)   ((PRUint64)(a) op (PRUint64)(b))
-
-/***********************************************************************
-** MACROS:      LL_<logical operators>
-**
-**  LL_AND            Logical and
-**  LL_OR             Logical or
-**  LL_XOR            Logical exclusion
-**  LL_OR2            A disgusting deviation
-**  LL_NOT            Negation (one's complement)
-***********************************************************************/
-#define LL_AND(r, a, b)        ((r) = (a) & (b))
-#define LL_OR(r, a, b)        ((r) = (a) | (b))
-#define LL_XOR(r, a, b)        ((r) = (a) ^ (b))
-#define LL_OR2(r, a)        ((r) = (r) | (a))
-#define LL_NOT(r, a)        ((r) = ~(a))
-
-/***********************************************************************
-** MACROS:      LL_<mathematical operators>
-**
-**  LL_NEG            Negation (two's complement)
-**  LL_ADD            Summation (two's complement)
-**  LL_SUB            Difference (two's complement)
-***********************************************************************/
-#define LL_NEG(r, a)        ((r) = -(a))
-#define LL_ADD(r, a, b)     ((r) = (a) + (b))
-#define LL_SUB(r, a, b)     ((r) = (a) - (b))
-
-/***********************************************************************
-** MACROS:      LL_<mathematical operators>
-**
-**  LL_MUL            Product (two's complement)
-**  LL_DIV            Quotient (two's complement)
-**  LL_MOD            Modulus (two's complement)
-***********************************************************************/
-#define LL_MUL(r, a, b)        ((r) = (a) * (b))
-#define LL_DIV(r, a, b)        ((r) = (a) / (b))
-#define LL_MOD(r, a, b)        ((r) = (a) % (b))
-
-/***********************************************************************
-** MACROS:      LL_<shifting operators>
-**
-**  LL_SHL            Shift left [0..64] bits
-**  LL_SHR            Shift right [0..64] bits with sign extension
-**  LL_USHR           Unsigned shift right [0..64] bits
-**  LL_ISHL           Signed shift left [0..64] bits
-***********************************************************************/
-#define LL_SHL(r, a, b)     ((r) = (PRInt64)(a) << (b))
-#define LL_SHR(r, a, b)     ((r) = (PRInt64)(a) >> (b))
-#define LL_USHR(r, a, b)    ((r) = (PRUint64)(a) >> (b))
-#define LL_ISHL(r, a, b)    ((r) = (PRInt64)(a) << (b))
-
-/***********************************************************************
-** MACROS:      LL_<conversion operators>
-**
-**  LL_L2I            Convert to signed 32 bit
-**  LL_L2UI           Convert to unsigned 32 bit
-**  LL_L2F            Convert to floating point
-**  LL_L2D            Convert to floating point
-**  LL_I2L            Convert signed to 64 bit
-**  LL_UI2L           Convert unsigned to 64 bit
-**  LL_F2L            Convert float to 64 bit
-**  LL_D2L            Convert float to 64 bit
-***********************************************************************/
-#define LL_L2I(i, l)        ((i) = (PRInt32)(l))
-#define LL_L2UI(ui, l)        ((ui) = (PRUint32)(l))
-#define LL_L2F(f, l)        ((f) = (PRFloat64)(l))
-#define LL_L2D(d, l)        ((d) = (PRFloat64)(l))
-
-#define LL_I2L(l, i)        ((l) = (PRInt64)(i))
-#define LL_UI2L(l, ui)        ((l) = (PRInt64)(ui))
-#define LL_F2L(l, f)        ((l) = (PRInt64)(f))
-#define LL_D2L(l, d)        ((l) = (PRInt64)(d))
-
-/***********************************************************************
-** MACROS:      LL_UDIVMOD
-** DESCRIPTION:
-**  Produce both a quotient and a remainder given an unsigned 
-** INPUTS:      PRUint64 a: The dividend of the operation
-**              PRUint64 b: The quotient of the operation
-** OUTPUTS:     PRUint64 *qp: pointer to quotient
-**              PRUint64 *rp: pointer to remainder
-***********************************************************************/
-#define LL_UDIVMOD(qp, rp, a, b) \
-    (*(qp) = ((PRUint64)(a) / (b)), \
-     *(rp) = ((PRUint64)(a) % (b)))
-
-#else  /* !HAVE_LONG_LONG */
-
-#define LL_MAXINT   LL_MaxInt()
-#define LL_MININT   LL_MinInt()
-#define LL_ZERO     LL_Zero()
-#define LL_MAXUINT  LL_MaxUint()
-
-#ifdef IS_LITTLE_ENDIAN
-#define LL_INIT(hi, lo) {PR_UINT32(lo), PR_UINT32(hi)}
-#else
-#define LL_INIT(hi, lo) {PR_UINT32(hi), PR_UINT32(lo)}
-#endif
-
-#define LL_IS_ZERO(a)        (((a).hi == 0) && ((a).lo == 0))
-#define LL_EQ(a, b)        (((a).hi == (b).hi) && ((a).lo == (b).lo))
-#define LL_NE(a, b)        (((a).hi != (b).hi) || ((a).lo != (b).lo))
-#define LL_GE_ZERO(a)        (((a).hi >> 31) == 0)
-
-#define LL_CMP(a, op, b)    (((a).hi == (b).hi) ? ((a).lo op (b).lo) : \
-                 ((PRInt32)(a).hi op (PRInt32)(b).hi))
-#define LL_UCMP(a, op, b)    (((a).hi == (b).hi) ? ((a).lo op (b).lo) : \
-                 ((a).hi op (b).hi))
-
-#define LL_AND(r, a, b)        ((r).lo = (a).lo & (b).lo, \
-                 (r).hi = (a).hi & (b).hi)
-#define LL_OR(r, a, b)        ((r).lo = (a).lo | (b).lo, \
-                 (r).hi = (a).hi | (b).hi)
-#define LL_XOR(r, a, b)        ((r).lo = (a).lo ^ (b).lo, \
-                 (r).hi = (a).hi ^ (b).hi)
-#define LL_OR2(r, a)        ((r).lo = (r).lo | (a).lo, \
-                 (r).hi = (r).hi | (a).hi)
-#define LL_NOT(r, a)        ((r).lo = ~(a).lo, \
-                 (r).hi = ~(a).hi)
-
-#define LL_NEG(r, a)        ((r).lo = -(PRInt32)(a).lo, \
-                 (r).hi = -(PRInt32)(a).hi - ((r).lo != 0))
-#define LL_ADD(r, a, b) { \
-    PRInt64 _a, _b; \
-    _a = a; _b = b; \
-    (r).lo = _a.lo + _b.lo; \
-    (r).hi = _a.hi + _b.hi + ((r).lo < _b.lo); \
-}
-
-#define LL_SUB(r, a, b) { \
-    PRInt64 _a, _b; \
-    _a = a; _b = b; \
-    (r).lo = _a.lo - _b.lo; \
-    (r).hi = _a.hi - _b.hi - (_a.lo < _b.lo); \
-}
-
-#define LL_MUL(r, a, b) { \
-    PRInt64 _a, _b; \
-    _a = a; _b = b; \
-    LL_MUL32(r, _a.lo, _b.lo); \
-    (r).hi += _a.hi * _b.lo + _a.lo * _b.hi; \
-}
-
-#define _lo16(a)        ((a) & PR_BITMASK(16))
-#define _hi16(a)        ((a) >> 16)
-
-#define LL_MUL32(r, a, b) { \
-     PRUint32 _a1, _a0, _b1, _b0, _y0, _y1, _y2, _y3; \
-     _a1 = _hi16(a), _a0 = _lo16(a); \
-     _b1 = _hi16(b), _b0 = _lo16(b); \
-     _y0 = _a0 * _b0; \
-     _y1 = _a0 * _b1; \
-     _y2 = _a1 * _b0; \
-     _y3 = _a1 * _b1; \
-     _y1 += _hi16(_y0);                         /* can't carry */ \
-     _y1 += _y2;                                /* might carry */ \
-     if (_y1 < _y2)    \
-        _y3 += (PRUint32)(PR_BIT(16));  /* propagate */ \
-     (r).lo = (_lo16(_y1) << 16) + _lo16(_y0); \
-     (r).hi = _y3 + _hi16(_y1); \
-}
-
-#define LL_UDIVMOD(qp, rp, a, b)    ll_udivmod(qp, rp, a, b)
-
-NSPR_API(void) ll_udivmod(PRUint64 *qp, PRUint64 *rp, PRUint64 a, PRUint64 b);
-
-#define LL_DIV(r, a, b) { \
-    PRInt64 _a, _b; \
-    PRUint32 _negative = (PRInt32)(a).hi < 0; \
-    if (_negative) { \
-    LL_NEG(_a, a); \
-    } else { \
-    _a = a; \
-    } \
-    if ((PRInt32)(b).hi < 0) { \
-    _negative ^= 1; \
-    LL_NEG(_b, b); \
-    } else { \
-    _b = b; \
-    } \
-    LL_UDIVMOD(&(r), 0, _a, _b); \
-    if (_negative) \
-    LL_NEG(r, r); \
-}
-
-#define LL_MOD(r, a, b) { \
-    PRInt64 _a, _b; \
-    PRUint32 _negative = (PRInt32)(a).hi < 0; \
-    if (_negative) { \
-    LL_NEG(_a, a); \
-    } else { \
-    _a = a; \
-    } \
-    if ((PRInt32)(b).hi < 0) { \
-    LL_NEG(_b, b); \
-    } else { \
-    _b = b; \
-    } \
-    LL_UDIVMOD(0, &(r), _a, _b); \
-    if (_negative) \
-    LL_NEG(r, r); \
-}
-
-#define LL_SHL(r, a, b) { \
-    if (b) { \
-    PRInt64 _a; \
-        _a = a; \
-        if ((b) < 32) { \
-        (r).lo = _a.lo << ((b) & 31); \
-        (r).hi = (_a.hi << ((b) & 31)) | (_a.lo >> (32 - (b))); \
-    } else { \
-        (r).lo = 0; \
-        (r).hi = _a.lo << ((b) & 31); \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-/* a is an PRInt32, b is PRInt32, r is PRInt64 */
-#define LL_ISHL(r, a, b) { \
-    if (b) { \
-    PRInt64 _a; \
-    _a.lo = (a); \
-    _a.hi = 0; \
-        if ((b) < 32) { \
-        (r).lo = (a) << ((b) & 31); \
-        (r).hi = ((a) >> (32 - (b))); \
-    } else { \
-        (r).lo = 0; \
-        (r).hi = (a) << ((b) & 31); \
-    } \
-    } else { \
-    (r).lo = (a); \
-    (r).hi = 0; \
-    } \
-}
-
-#define LL_SHR(r, a, b) { \
-    if (b) { \
-    PRInt64 _a; \
-        _a = a; \
-    if ((b) < 32) { \
-        (r).lo = (_a.hi << (32 - (b))) | (_a.lo >> ((b) & 31)); \
-        (r).hi = (PRInt32)_a.hi >> ((b) & 31); \
-    } else { \
-        (r).lo = (PRInt32)_a.hi >> ((b) & 31); \
-        (r).hi = (PRInt32)_a.hi >> 31; \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-#define LL_USHR(r, a, b) { \
-    if (b) { \
-    PRInt64 _a; \
-        _a = a; \
-    if ((b) < 32) { \
-        (r).lo = (_a.hi << (32 - (b))) | (_a.lo >> ((b) & 31)); \
-        (r).hi = _a.hi >> ((b) & 31); \
-    } else { \
-        (r).lo = _a.hi >> ((b) & 31); \
-        (r).hi = 0; \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-#define LL_L2I(i, l)        ((i) = (l).lo)
-#define LL_L2UI(ui, l)        ((ui) = (l).lo)
-#define LL_L2F(f, l)        { double _d; LL_L2D(_d, l); (f) = (PRFloat64)_d; }
-
-#define LL_L2D(d, l) { \
-    int _negative; \
-    PRInt64 _absval; \
- \
-    _negative = (l).hi >> 31; \
-    if (_negative) { \
-    LL_NEG(_absval, l); \
-    } else { \
-    _absval = l; \
-    } \
-    (d) = (double)_absval.hi * 4.294967296e9 + _absval.lo; \
-    if (_negative) \
-    (d) = -(d); \
-}
-
-#define LL_I2L(l, i)        { PRInt32 _i = ((PRInt32)(i)) >> 31; (l).lo = (i); (l).hi = _i; }
-#define LL_UI2L(l, ui)      ((l).lo = (ui), (l).hi = 0)
-#define LL_F2L(l, f)        { double _d = (double)f; LL_D2L(l, _d); }
-
-#define LL_D2L(l, d) { \
-    int _negative; \
-    double _absval, _d_hi; \
-    PRInt64 _lo_d; \
- \
-    _negative = ((d) < 0); \
-    _absval = _negative ? -(d) : (d); \
- \
-    (l).hi = _absval / 4.294967296e9; \
-    (l).lo = 0; \
-    LL_L2D(_d_hi, l); \
-    _absval -= _d_hi; \
-    _lo_d.hi = 0; \
-    if (_absval < 0) { \
-    _lo_d.lo = -_absval; \
-    LL_SUB(l, l, _lo_d); \
-    } else { \
-    _lo_d.lo = _absval; \
-    LL_ADD(l, l, _lo_d); \
-    } \
- \
-    if (_negative) \
-    LL_NEG(l, l); \
-}
-
-#endif /* !HAVE_LONG_LONG */
-
-PR_END_EXTERN_C
-
-#endif /* prlong_h___ */
diff --git a/third_party/mozilla/include/prtime.h b/third_party/mozilla/include/prtime.h
deleted file mode 100644
index 35ff507..0000000
--- a/third_party/mozilla/include/prtime.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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 the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * 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 ***** */
-
-/*
- *----------------------------------------------------------------------
- *
- * prtime.h --
- *
- *     NSPR date and time functions
- *
- *-----------------------------------------------------------------------
- */
-
-#ifndef prtime_h___
-#define prtime_h___
-
-#include "prlong.h"
-
-PR_BEGIN_EXTERN_C
-
-/**********************************************************************/
-/************************* TYPES AND CONSTANTS ************************/
-/**********************************************************************/
-
-#define PR_MSEC_PER_SEC		1000UL
-#define PR_USEC_PER_SEC		1000000UL
-#define PR_NSEC_PER_SEC		1000000000UL
-#define PR_USEC_PER_MSEC	1000UL
-#define PR_NSEC_PER_MSEC	1000000UL
-
-/*
- * PRTime --
- *
- *     NSPR represents basic time as 64-bit signed integers relative
- *     to midnight (00:00:00), January 1, 1970 Greenwich Mean Time (GMT).
- *     (GMT is also known as Coordinated Universal Time, UTC.)
- *     The units of time are in microseconds. Negative times are allowed
- *     to represent times prior to the January 1970 epoch. Such values are
- *     intended to be exported to other systems or converted to human
- *     readable form.
- *
- *     Notes on porting: PRTime corresponds to time_t in ANSI C.  NSPR 1.0
- *     simply uses PRInt64.
- */
-
-typedef PRInt64 PRTime;
-
-/*
- * Time zone and daylight saving time corrections applied to GMT to
- * obtain the local time of some geographic location
- */
-
-typedef struct PRTimeParameters {
-    PRInt32 tp_gmt_offset;     /* the offset from GMT in seconds */
-    PRInt32 tp_dst_offset;     /* contribution of DST in seconds */
-} PRTimeParameters;
-
-/*
- * PRExplodedTime --
- *
- *     Time broken down into human-readable components such as year, month,
- *     day, hour, minute, second, and microsecond.  Time zone and daylight
- *     saving time corrections may be applied.  If they are applied, the
- *     offsets from the GMT must be saved in the 'tm_params' field so that
- *     all the information is available to reconstruct GMT.
- *
- *     Notes on porting: PRExplodedTime corrresponds to struct tm in
- *     ANSI C, with the following differences:
- *       - an additional field tm_usec;
- *       - replacing tm_isdst by tm_params;
- *       - the month field is spelled tm_month, not tm_mon;
- *       - we use absolute year, AD, not the year since 1900.
- *     The corresponding type in NSPR 1.0 is called PRTime.  Below is
- *     a table of date/time type correspondence in the three APIs:
- *         API          time since epoch          time in components
- *       ANSI C             time_t                  struct tm
- *       NSPR 1.0           PRInt64                   PRTime
- *       NSPR 2.0           PRTime                  PRExplodedTime
- */
-
-typedef struct PRExplodedTime {
-    PRInt32 tm_usec;		    /* microseconds past tm_sec (0-99999)  */
-    PRInt32 tm_sec;             /* seconds past tm_min (0-61, accomodating
-                                   up to two leap seconds) */	
-    PRInt32 tm_min;             /* minutes past tm_hour (0-59) */
-    PRInt32 tm_hour;            /* hours past tm_day (0-23) */
-    PRInt32 tm_mday;            /* days past tm_mon (1-31, note that it
-				                starts from 1) */
-    PRInt32 tm_month;           /* months past tm_year (0-11, Jan = 0) */
-    PRInt16 tm_year;            /* absolute year, AD (note that we do not
-				                count from 1900) */
-
-    PRInt8 tm_wday;		        /* calculated day of the week
-				                (0-6, Sun = 0) */
-    PRInt16 tm_yday;            /* calculated day of the year 
-				                (0-365, Jan 1 = 0) */
-
-    PRTimeParameters tm_params;  /* time parameters used by conversion */
-} PRExplodedTime;
-
-/*
- * PRTimeParamFn --
- *
- *     A function of PRTimeParamFn type returns the time zone and
- *     daylight saving time corrections for some geographic location,
- *     given the current time in GMT.  The input argument gmt should
- *     point to a PRExplodedTime that is in GMT, i.e., whose
- *     tm_params contains all 0's.
- *
- *     For any time zone other than GMT, the computation is intended to
- *     consist of two steps:
- *       - Figure out the time zone correction, tp_gmt_offset.  This number
- *         usually depends on the geographic location only.  But it may
- *         also depend on the current time.  For example, all of China
- *         is one time zone right now.  But this situation may change
- *         in the future.
- *       - Figure out the daylight saving time correction, tp_dst_offset.
- *         This number depends on both the geographic location and the
- *         current time.  Most of the DST rules are expressed in local
- *         current time.  If so, one should apply the time zone correction
- *         to GMT before applying the DST rules.
- */
-
-typedef PRTimeParameters (PR_CALLBACK *PRTimeParamFn)(const PRExplodedTime *gmt);
-
-/**********************************************************************/
-/****************************** FUNCTIONS *****************************/
-/**********************************************************************/
-
-/*
- * The PR_Now routine returns the current time relative to the
- * epoch, midnight, January 1, 1970 UTC. The units of the returned
- * value are microseconds since the epoch.
- *
- * The values returned are not guaranteed to advance in a linear fashion
- * due to the application of time correction protocols which synchronize
- * computer clocks to some external time source. Consequently it should
- * not be depended on for interval timing.
- *
- * The implementation is machine dependent.
- * Cf. time_t time(time_t *tp) in ANSI C.
- */
-#if defined(HAVE_WATCOM_BUG_2)
-PRTime __pascal __export __loadds
-#else
-NSPR_API(PRTime) 
-#endif
-PR_Now(void);
-
-/*
- * Expand time binding it to time parameters provided by PRTimeParamFn.
- * The calculation is envisoned to proceed in the following steps:
- *   - From given PRTime, calculate PRExplodedTime in GMT
- *   - Apply the given PRTimeParamFn to the GMT that we just calculated
- *     to obtain PRTimeParameters.
- *   - Add the PRTimeParameters offsets to GMT to get the local time
- *     as PRExplodedTime.
- */
-
-NSPR_API(void) PR_ExplodeTime(
-    PRTime usecs, PRTimeParamFn params, PRExplodedTime *exploded);
-
-/* Reverse operation of PR_ExplodeTime */
-#if defined(HAVE_WATCOM_BUG_2)
-PRTime __pascal __export __loadds
-#else
-NSPR_API(PRTime) 
-#endif
-PR_ImplodeTime(const PRExplodedTime *exploded);
-
-/*
- * Adjust exploded time to normalize field overflows after manipulation.
- * Note that the following fields of PRExplodedTime should not be
- * manipulated:
- *   - tm_month and tm_year: because the number of days in a month and
- *     number of days in a year are not constant, it is ambiguous to
- *     manipulate the month and year fields, although one may be tempted
- *     to.  For example, what does "a month from January 31st" mean?
- *   - tm_wday and tm_yday: these fields are calculated by NSPR.  Users
- *     should treat them as "read-only".
- */
-
-NSPR_API(void) PR_NormalizeTime(
-    PRExplodedTime *exploded, PRTimeParamFn params);
-
-/**********************************************************************/
-/*********************** TIME PARAMETER FUNCTIONS *********************/
-/**********************************************************************/
-
-/* Time parameters that suit current host machine */
-NSPR_API(PRTimeParameters) PR_LocalTimeParameters(const PRExplodedTime *gmt);
-
-/* Time parameters that represent Greenwich Mean Time */
-NSPR_API(PRTimeParameters) PR_GMTParameters(const PRExplodedTime *gmt);
-
-/*
- * Time parameters that represent the US Pacific Time Zone, with the
- * current daylight saving time rules (for testing only)
- */
-NSPR_API(PRTimeParameters) PR_USPacificTimeParameters(const PRExplodedTime *gmt);
-
-/*
- * This parses a time/date string into a PRTime
- * (microseconds after "1-Jan-1970 00:00:00 GMT").
- * It returns PR_SUCCESS on success, and PR_FAILURE
- * if the time/date string can't be parsed.
- *
- * Many formats are handled, including:
- *
- *   14 Apr 89 03:20:12
- *   14 Apr 89 03:20 GMT
- *   Fri, 17 Mar 89 4:01:33
- *   Fri, 17 Mar 89 4:01 GMT
- *   Mon Jan 16 16:12 PDT 1989
- *   Mon Jan 16 16:12 +0130 1989
- *   6 May 1992 16:41-JST (Wednesday)
- *   22-AUG-1993 10:59:12.82
- *   22-AUG-1993 10:59pm
- *   22-AUG-1993 12:59am
- *   22-AUG-1993 12:59 PM
- *   Friday, August 04, 1995 3:54 PM
- *   06/21/95 04:24:34 PM
- *   20/06/95 21:07
- *   95-06-08 19:32:48 EDT
- *
- * If the input string doesn't contain a description of the timezone,
- * we consult the `default_to_gmt' to decide whether the string should
- * be interpreted relative to the local time zone (PR_FALSE) or GMT (PR_TRUE).
- * The correct value for this argument depends on what standard specified
- * the time string which you are parsing.
- */
-
-NSPR_API(PRStatus) PR_ParseTimeString (
-	const char *string,
-	PRBool default_to_gmt,
-	PRTime *result);
-
-/*
- * FIXME: should we also have a formatting function, such as asctime, ctime,
- * and strftime in standard C library?  But this would involve
- * internationalization issues.  Might want to provide a US English version.
- */
-
-/**********************************************************************/
-/*********************** OLD COMPATIBILITYFUNCTIONS *******************/
-/**********************************************************************/
-#ifndef NO_NSPR_10_SUPPORT
-
-/* Format a time value into a buffer. Same semantics as strftime() */
-NSPR_API(PRUint32) PR_FormatTime(char *buf, int buflen, const char *fmt, 
-                                           const PRExplodedTime *tm);
-
-/* Format a time value into a buffer. Time is always in US English format, regardless
- * of locale setting.
- */
-NSPR_API(PRUint32)
-PR_FormatTimeUSEnglish( char* buf, PRUint32 bufSize,
-                        const char* format, const PRExplodedTime* tm );
-
-#endif /* NO_NSPR_10_SUPPORT */
-
-PR_END_EXTERN_C
-
-#endif /* prtime_h___ */
diff --git a/third_party/mozilla/include/prtypes.h b/third_party/mozilla/include/prtypes.h
deleted file mode 100644
index 8b9f35c..0000000
--- a/third_party/mozilla/include/prtypes.h
+++ /dev/null
@@ -1,555 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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 the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * 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 ***** */
-
-/*
-** File:                prtypes.h
-** Description: Definitions of NSPR's basic types
-**
-** Prototypes and macros used to make up for deficiencies that we have found
-** in ANSI environments.
-**
-** Since we do not wrap <stdlib.h> and all the other standard headers, authors
-** of portable code will not know in general that they need these definitions.
-** Instead of requiring these authors to find the dependent uses in their code
-** and take the following steps only in those C files, we take steps once here
-** for all C files.
-**/
-
-#ifndef prtypes_h___
-#define prtypes_h___
-
-#ifdef MDCPUCFG
-#include MDCPUCFG
-#else
-#include "prcpucfg.h"
-#endif
-
-#include <stddef.h>
-
-/***********************************************************************
-** MACROS:      PR_EXTERN
-**              PR_IMPLEMENT
-** DESCRIPTION:
-**      These are only for externally visible routines and globals.  For
-**      internal routines, just use "extern" for type checking and that
-**      will not export internal cross-file or forward-declared symbols.
-**      Define a macro for declaring procedures return types. We use this to
-**      deal with windoze specific type hackery for DLL definitions. Use
-**      PR_EXTERN when the prototype for the method is declared. Use
-**      PR_IMPLEMENT for the implementation of the method.
-**
-** Example:
-**   in dowhim.h
-**     PR_EXTERN( void ) DoWhatIMean( void );
-**   in dowhim.c
-**     PR_IMPLEMENT( void ) DoWhatIMean( void ) { return; }
-**
-**
-***********************************************************************/
-#if defined(WIN32)
-
-#define PR_EXPORT(__type) extern __declspec(dllexport) __type
-#define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT(__type) __declspec(dllimport) __type
-#define PR_IMPORT_DATA(__type) __declspec(dllimport) __type
-
-#define PR_EXTERN(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT(__type) __declspec(dllexport) __type
-#define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
-
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#elif defined(XP_BEOS)
-
-#define PR_EXPORT(__type) extern __declspec(dllexport) __type
-#define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT_DATA(__type) extern __declspec(dllexport) __type
-
-#define PR_EXTERN(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT(__type) __declspec(dllexport) __type
-#define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
-
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#elif defined(WIN16)
-
-#define PR_CALLBACK_DECL        __cdecl
-
-#if defined(_WINDLL)
-#define PR_EXPORT(__type) extern __type _cdecl _export _loadds
-#define PR_IMPORT(__type) extern __type _cdecl _export _loadds
-#define PR_EXPORT_DATA(__type) extern __type _export
-#define PR_IMPORT_DATA(__type) extern __type _export
-
-#define PR_EXTERN(__type) extern __type _cdecl _export _loadds
-#define PR_IMPLEMENT(__type) __type _cdecl _export _loadds
-#define PR_EXTERN_DATA(__type) extern __type _export
-#define PR_IMPLEMENT_DATA(__type) __type _export
-
-#define PR_CALLBACK             __cdecl __loadds
-#define PR_STATIC_CALLBACK(__x) static __x PR_CALLBACK
-
-#else /* this must be .EXE */
-#define PR_EXPORT(__type) extern __type _cdecl _export
-#define PR_IMPORT(__type) extern __type _cdecl _export
-#define PR_EXPORT_DATA(__type) extern __type _export
-#define PR_IMPORT_DATA(__type) extern __type _export
-
-#define PR_EXTERN(__type) extern __type _cdecl _export
-#define PR_IMPLEMENT(__type) __type _cdecl _export
-#define PR_EXTERN_DATA(__type) extern __type _export
-#define PR_IMPLEMENT_DATA(__type) __type _export
-
-#define PR_CALLBACK             __cdecl __loadds
-#define PR_STATIC_CALLBACK(__x) __x PR_CALLBACK
-#endif /* _WINDLL */
-
-#elif defined(XP_MAC)
-
-#define PR_EXPORT(__type) extern __declspec(export) __type
-#define PR_EXPORT_DATA(__type) extern __declspec(export) __type
-#define PR_IMPORT(__type) extern __declspec(export) __type
-#define PR_IMPORT_DATA(__type) extern __declspec(export) __type
-
-#define PR_EXTERN(__type) extern __declspec(export) __type
-#define PR_IMPLEMENT(__type) __declspec(export) __type
-#define PR_EXTERN_DATA(__type) extern __declspec(export) __type
-#define PR_IMPLEMENT_DATA(__type) __declspec(export) __type
-
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#elif defined(XP_OS2_VACPP) 
-
-#define PR_EXPORT(__type) extern __type
-#define PR_EXPORT_DATA(__type) extern __type
-#define PR_IMPORT(__type) extern __type
-#define PR_IMPORT_DATA(__type) extern __type
-
-#define PR_EXTERN(__type) extern __type
-#define PR_IMPLEMENT(__type) __type
-#define PR_EXTERN_DATA(__type) extern __type
-#define PR_IMPLEMENT_DATA(__type) __type
-#define PR_CALLBACK _Optlink
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x PR_CALLBACK
-
-#else /* Unix */
-
-#ifdef HAVE_VISIBILITY_PRAGMA
-#define PR_VISIBILITY_DEFAULT __attribute__((visibility("default")))
-#else
-#define PR_VISIBILITY_DEFAULT
-#endif
-
-#define PR_EXPORT(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_EXPORT_DATA(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_IMPORT(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_IMPORT_DATA(__type) extern PR_VISIBILITY_DEFAULT __type
-
-#define PR_EXTERN(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_IMPLEMENT(__type) PR_VISIBILITY_DEFAULT __type
-#define PR_EXTERN_DATA(__type) extern PR_VISIBILITY_DEFAULT __type
-#define PR_IMPLEMENT_DATA(__type) PR_VISIBILITY_DEFAULT __type
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#endif
-
-#if defined(_NSPR_BUILD_)
-#define NSPR_API(__type) PR_EXPORT(__type)
-#define NSPR_DATA_API(__type) PR_EXPORT_DATA(__type)
-#else
-#define NSPR_API(__type) PR_IMPORT(__type)
-#define NSPR_DATA_API(__type) PR_IMPORT_DATA(__type)
-#endif
-
-/***********************************************************************
-** MACROS:      PR_BEGIN_MACRO
-**              PR_END_MACRO
-** DESCRIPTION:
-**      Macro body brackets so that macros with compound statement definitions
-**      behave syntactically more like functions when called.
-***********************************************************************/
-#define PR_BEGIN_MACRO  do {
-#define PR_END_MACRO    } while (0)
-
-/***********************************************************************
-** MACROS:      PR_BEGIN_EXTERN_C
-**              PR_END_EXTERN_C
-** DESCRIPTION:
-**      Macro shorthands for conditional C++ extern block delimiters.
-***********************************************************************/
-#ifdef __cplusplus
-#define PR_BEGIN_EXTERN_C       extern "C" {
-#define PR_END_EXTERN_C         }
-#else
-#define PR_BEGIN_EXTERN_C
-#define PR_END_EXTERN_C
-#endif
-
-/***********************************************************************
-** MACROS:      PR_BIT
-**              PR_BITMASK
-** DESCRIPTION:
-** Bit masking macros.  XXX n must be <= 31 to be portable
-***********************************************************************/
-#define PR_BIT(n)       ((PRUint32)1 << (n))
-#define PR_BITMASK(n)   (PR_BIT(n) - 1)
-
-/***********************************************************************
-** MACROS:      PR_ROUNDUP
-**              PR_MIN
-**              PR_MAX
-**              PR_ABS
-** DESCRIPTION:
-**      Commonly used macros for operations on compatible types.
-***********************************************************************/
-#define PR_ROUNDUP(x,y) ((((x)+((y)-1))/(y))*(y))
-#define PR_MIN(x,y)     ((x)<(y)?(x):(y))
-#define PR_MAX(x,y)     ((x)>(y)?(x):(y))
-#define PR_ABS(x)       ((x)<0?-(x):(x))
-
-PR_BEGIN_EXTERN_C
-
-/************************************************************************
-** TYPES:       PRUint8
-**              PRInt8
-** DESCRIPTION:
-**  The int8 types are known to be 8 bits each. There is no type that
-**      is equivalent to a plain "char". 
-************************************************************************/
-#if PR_BYTES_PER_BYTE == 1
-typedef unsigned char PRUint8;
-/*
-** Some cfront-based C++ compilers do not like 'signed char' and
-** issue the warning message:
-**     warning: "signed" not implemented (ignored)
-** For these compilers, we have to define PRInt8 as plain 'char'.
-** Make sure that plain 'char' is indeed signed under these compilers.
-*/
-#if (defined(HPUX) && defined(__cplusplus) \
-        && !defined(__GNUC__) && __cplusplus < 199707L) \
-    || (defined(SCO) && defined(__cplusplus) \
-        && !defined(__GNUC__) && __cplusplus == 1L)
-typedef char PRInt8;
-#else
-typedef signed char PRInt8;
-#endif
-#else
-#error No suitable type for PRInt8/PRUint8
-#endif
-
-/************************************************************************
- * MACROS:      PR_INT8_MAX
- *              PR_INT8_MIN
- *              PR_UINT8_MAX
- * DESCRIPTION:
- *  The maximum and minimum values of a PRInt8 or PRUint8.
-************************************************************************/
-
-#define PR_INT8_MAX 127
-#define PR_INT8_MIN (-128)
-#define PR_UINT8_MAX 255U
-
-/************************************************************************
-** TYPES:       PRUint16
-**              PRInt16
-** DESCRIPTION:
-**  The int16 types are known to be 16 bits each. 
-************************************************************************/
-#if PR_BYTES_PER_SHORT == 2
-typedef unsigned short PRUint16;
-typedef short PRInt16;
-#else
-#error No suitable type for PRInt16/PRUint16
-#endif
-
-/************************************************************************
- * MACROS:      PR_INT16_MAX
- *              PR_INT16_MIN
- *              PR_UINT16_MAX
- * DESCRIPTION:
- *  The maximum and minimum values of a PRInt16 or PRUint16.
-************************************************************************/
-
-#define PR_INT16_MAX 32767
-#define PR_INT16_MIN (-32768)
-#define PR_UINT16_MAX 65535U
-
-/************************************************************************
-** TYPES:       PRUint32
-**              PRInt32
-** DESCRIPTION:
-**  The int32 types are known to be 32 bits each. 
-************************************************************************/
-#if PR_BYTES_PER_INT == 4
-typedef unsigned int PRUint32;
-typedef int PRInt32;
-#define PR_INT32(x)  x
-#define PR_UINT32(x) x ## U
-#elif PR_BYTES_PER_LONG == 4
-typedef unsigned long PRUint32;
-typedef long PRInt32;
-#define PR_INT32(x)  x ## L
-#define PR_UINT32(x) x ## UL
-#else
-#error No suitable type for PRInt32/PRUint32
-#endif
-
-/************************************************************************
- * MACROS:      PR_INT32_MAX
- *              PR_INT32_MIN
- *              PR_UINT32_MAX
- * DESCRIPTION:
- *  The maximum and minimum values of a PRInt32 or PRUint32.
-************************************************************************/
-
-#define PR_INT32_MAX PR_INT32(2147483647)
-#define PR_INT32_MIN (-PR_INT32_MAX - 1)
-#define PR_UINT32_MAX PR_UINT32(4294967295)
-
-/************************************************************************
-** TYPES:       PRUint64
-**              PRInt64
-** DESCRIPTION:
-**  The int64 types are known to be 64 bits each. Care must be used when
-**      declaring variables of type PRUint64 or PRInt64. Different hardware
-**      architectures and even different compilers have varying support for
-**      64 bit values. The only guaranteed portability requires the use of
-**      the LL_ macros (see prlong.h).
-************************************************************************/
-#ifdef HAVE_LONG_LONG
-#if PR_BYTES_PER_LONG == 8
-typedef long PRInt64;
-typedef unsigned long PRUint64;
-#elif defined(WIN16)
-typedef __int64 PRInt64;
-typedef unsigned __int64 PRUint64;
-#elif defined(WIN32) && !defined(__GNUC__)
-typedef __int64  PRInt64;
-typedef unsigned __int64 PRUint64;
-#else
-typedef long long PRInt64;
-typedef unsigned long long PRUint64;
-#endif /* PR_BYTES_PER_LONG == 8 */
-#else  /* !HAVE_LONG_LONG */
-typedef struct {
-#ifdef IS_LITTLE_ENDIAN
-    PRUint32 lo, hi;
-#else
-    PRUint32 hi, lo;
-#endif
-} PRInt64;
-typedef PRInt64 PRUint64;
-#endif /* !HAVE_LONG_LONG */
-
-/************************************************************************
-** TYPES:       PRUintn
-**              PRIntn
-** DESCRIPTION:
-**  The PRIntn types are most appropriate for automatic variables. They are
-**      guaranteed to be at least 16 bits, though various architectures may
-**      define them to be wider (e.g., 32 or even 64 bits). These types are
-**      never valid for fields of a structure. 
-************************************************************************/
-#if PR_BYTES_PER_INT >= 2
-typedef int PRIntn;
-typedef unsigned int PRUintn;
-#else
-#error 'sizeof(int)' not sufficient for platform use
-#endif
-
-/************************************************************************
-** TYPES:       PRFloat64
-** DESCRIPTION:
-**  NSPR's floating point type is always 64 bits. 
-************************************************************************/
-typedef double          PRFloat64;
-
-/************************************************************************
-** TYPES:       PRSize
-** DESCRIPTION:
-**  A type for representing the size of objects. 
-************************************************************************/
-typedef size_t PRSize;
-
-
-/************************************************************************
-** TYPES:       PROffset32, PROffset64
-** DESCRIPTION:
-**  A type for representing byte offsets from some location. 
-************************************************************************/
-typedef PRInt32 PROffset32;
-typedef PRInt64 PROffset64;
-
-/************************************************************************
-** TYPES:       PRPtrDiff
-** DESCRIPTION:
-**  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer subtraction. 
-************************************************************************/
-typedef ptrdiff_t PRPtrdiff;
-
-/************************************************************************
-** TYPES:       PRUptrdiff
-** DESCRIPTION:
-**  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer sutraction. 
-************************************************************************/
-typedef unsigned long PRUptrdiff;
-
-/************************************************************************
-** TYPES:       PRBool
-** DESCRIPTION:
-**  Use PRBool for variables and parameter types. Use PR_FALSE and PR_TRUE
-**      for clarity of target type in assignments and actual arguments. Use
-**      'if (bool)', 'while (!bool)', '(bool) ? x : y' etc., to test booleans
-**      just as you would C int-valued conditions. 
-************************************************************************/
-typedef PRIntn PRBool;
-#define PR_TRUE 1
-#define PR_FALSE 0
-
-/************************************************************************
-** TYPES:       PRPackedBool
-** DESCRIPTION:
-**  Use PRPackedBool within structs where bitfields are not desirable
-**      but minimum and consistant overhead matters.
-************************************************************************/
-typedef PRUint8 PRPackedBool;
-
-/*
-** Status code used by some routines that have a single point of failure or 
-** special status return.
-*/
-typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus;
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This type may be removed in a future release.
- */
-#ifndef __PRUNICHAR__
-#define __PRUNICHAR__
-#if defined(WIN32) || defined(XP_MAC)
-typedef wchar_t PRUnichar;
-#else
-typedef PRUint16 PRUnichar;
-#endif
-#endif
-#endif /* MOZ_UNICODE */
-
-/*
-** WARNING: The undocumented data types PRWord and PRUword are
-** only used in the garbage collection and arena code.  Do not
-** use PRWord and PRUword in new code.
-**
-** A PRWord is an integer that is the same size as a void*.
-** It implements the notion of a "word" in the Java Virtual
-** Machine.  (See Sec. 3.4 "Words", The Java Virtual Machine
-** Specification, Addison-Wesley, September 1996.
-** http://java.sun.com/docs/books/vmspec/index.html.)
-*/
-typedef long PRWord;
-typedef unsigned long PRUword;
-
-#if defined(NO_NSPR_10_SUPPORT)
-#else
-/********* ???????????????? FIX ME       ??????????????????????????? *****/
-/********************** Some old definitions until pr=>ds transition is done ***/
-/********************** Also, we are still using NSPR 1.0. GC ******************/
-/*
-** Fundamental NSPR macros, used nearly everywhere.
-*/
-
-#define PR_PUBLIC_API		PR_IMPLEMENT
-
-/*
-** Macro body brackets so that macros with compound statement definitions
-** behave syntactically more like functions when called.
-*/
-#define NSPR_BEGIN_MACRO        do {
-#define NSPR_END_MACRO          } while (0)
-
-/*
-** Macro shorthands for conditional C++ extern block delimiters.
-*/
-#ifdef NSPR_BEGIN_EXTERN_C
-#undef NSPR_BEGIN_EXTERN_C
-#endif
-#ifdef NSPR_END_EXTERN_C
-#undef NSPR_END_EXTERN_C
-#endif
-
-#ifdef __cplusplus
-#define NSPR_BEGIN_EXTERN_C     extern "C" {
-#define NSPR_END_EXTERN_C       }
-#else
-#define NSPR_BEGIN_EXTERN_C
-#define NSPR_END_EXTERN_C
-#endif
-
-// Begin Google Modified
-//#ifdef XP_MAC
-//#include "protypes.h"
-//#else
-//#include "obsolete/protypes.h"
-//#endif
-// End Google Modified
-
-/********* ????????????? End Fix me ?????????????????????????????? *****/
-#endif /* NO_NSPR_10_SUPPORT */
-
-PR_END_EXTERN_C
-
-// BEGIN GOOGLE MODIFICATIONS
-
-#include "base/basictypes.h"
-
-// END GOOGLE MODIFICATIONS
-
-#endif /* prtypes_h___ */
-
diff --git a/third_party/mozilla/include/xpcom-config.h b/third_party/mozilla/include/xpcom-config.h
deleted file mode 100644
index ba3991d..0000000
--- a/third_party/mozilla/include/xpcom-config.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* xpcom/xpcom-config.h.  Generated automatically by configure.  */
-/* Global defines needed by xpcom clients */
-
-#ifndef _XPCOM_CONFIG_H_
-#define _XPCOM_CONFIG_H_
-
-/* Define this to throw() if the compiler complains about 
- * constructors returning NULL
- */
-#define CPP_THROW_NEW throw()
-
-/* Define if the c++ compiler supports a 2-byte wchar_t */
-/* #undef HAVE_CPP_2BYTE_WCHAR_T */
-
-/* Define if the c++ compiler supports changing access with |using| */
-/* #undef HAVE_CPP_ACCESS_CHANGING_USING */
-
-/* Define if the c++ compiler can resolve ambiguity with |using| */
-/* #undef HAVE_CPP_AMBIGUITY_RESOLVING_USING */
-
-/* Define if the c++ compiler has builtin Bool type */
-/* #undef HAVE_CPP_BOOL */
-
-/* Define if a dyanmic_cast to void* gives the most derived object */
-/* #undef HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR */
-
-/* Define if the c++ compiler supports the |explicit| keyword */
-/* #undef HAVE_CPP_EXPLICIT */
-
-/* Define if the c++ compiler supports the modern template 
- * specialization syntax 
- */
-/* #undef HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX */
-
-/* Define if the c++ compiler supports the |std| namespace */
-/* #undef HAVE_CPP_NAMESPACE_STD */
-
-/* Define if the c++ compiler supports reinterpret_cast */
-/* #undef HAVE_CPP_NEW_CASTS */
-
-/* Define if the c++ compiler supports partial template specialization */
-/* #undef HAVE_CPP_PARTIAL_SPECIALIZATION */
-
-/* Define if the c++ compiler has trouble comparing a constant
- * reference to a templatized class to zero
- */
-/* #undef HAVE_CPP_TROUBLE_COMPARING_TO_ZERO */
-
-/* Define if the c++ compiler supports the |typename| keyword */
-/* #undef HAVE_CPP_TYPENAME */
-
-/* Define if the stanard template operator!=() is ambiguous */
-/* #undef HAVE_CPP_UNAMBIGUOUS_STD_NOTEQUAL */
-
-/* Define if statvfs() is available */
-/* #undef HAVE_STATVFS */
-
-/* Define if the c++ compiler requires implementations of 
- * unused virtual methods
- */
-/* #undef NEED_CPP_UNUSED_IMPLEMENTATIONS */
-
-/* Define to either <new> or <new.h> */
-#define NEW_H <new>
-
-/* Define if binary compatibility with Mozilla 1.x string code is desired */
-#define MOZ_V1_STRING_ABI 1
-
-#endif /* _XPCOM_CONFIG_H_ */
diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h
index 2970546..628f00d 100644
--- a/third_party/npapi/bindings/npapi.h
+++ b/third_party/npapi/bindings/npapi.h
@@ -139,7 +139,7 @@
 
 #define NP_VERSION_MAJOR 0
 // BEGIN GOOGLE MODIFICATIONS
-#define NP_VERSION_MINOR 19 // maximum version currently supported by Chromium
+#define NP_VERSION_MINOR 22 // maximum version currently supported by Chromium
 // END GOOGLE MODIFICATIONS