Update NPAPI headers to latest npapi-sdk

Updates to r10 of the upstream 'npapi-sdk' project headers (the replacement for npapi-headers). Also further reduces forking, by removing some old local changes that are no longer necassary.

BUG=42645
TEST=Everything still compiles

Review URL: http://codereview.chromium.org/7033014

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

3 files changed, 6 insertions, 32 deletions

diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h
index 0968651..3ce7607 100644
--- a/third_party/npapi/bindings/npapi.h
+++ b/third_party/npapi/bindings/npapi.h
@@ -390,7 +390,9 @@ typedef enum {
   /* Checks to see if the plug-in would like the browser to load the "src" attribute. */
   NPPVpluginCancelSrcStream = 20,
 
-  NPPVSupportsAdvancedKeyHandling = 21
+  NPPVsupportsAdvancedKeyHandling = 21,
+
+  NPPVpluginUsesDOMForCursorBool = 22
 
 #if defined(XP_MACOSX)
   /* Used for negotiating drawing models */
@@ -815,11 +817,9 @@ extern "C" {
 /* NPP_* functions are provided by the plugin and called by the navigator. */
 
 #if defined(XP_UNIX)
-char* NPP_GetMIMEDescription(void);
+const char* NPP_GetMIMEDescription(void);
 #endif
 
-NPError NP_LOADDS NPP_Initialize(void);
-void    NP_LOADDS NPP_Shutdown(void);
 NPError NP_LOADDS NPP_New(NPMIMEType pluginType, NPP instance,
                           uint16_t mode, int16_t argc, char* argn[],
                           char* argv[], NPSavedData* saved);
diff --git a/third_party/npapi/bindings/npfunctions.h b/third_party/npapi/bindings/npfunctions.h
index 113fa9c..9f918851 100644
--- a/third_party/npapi/bindings/npfunctions.h
+++ b/third_party/npapi/bindings/npfunctions.h
@@ -48,8 +48,6 @@
 #include "npapi.h"
 #include "npruntime.h"
 
-typedef void         (* NP_LOADDS NPP_InitializeProcPtr)(void);
-typedef void         (* NP_LOADDS NPP_ShutdownProcPtr)(void);
 typedef NPError      (* NP_LOADDS NPP_NewProcPtr)(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved);
 typedef NPError      (* NP_LOADDS NPP_DestroyProcPtr)(NPP instance, NPSavedData** save);
 typedef NPError      (* NP_LOADDS NPP_SetWindowProcPtr)(NPP instance, NPWindow* window);
diff --git a/third_party/npapi/bindings/npruntime.h b/third_party/npapi/bindings/npruntime.h
index 7111437..8c4b3df 100644
--- a/third_party/npapi/bindings/npruntime.h
+++ b/third_party/npapi/bindings/npruntime.h
@@ -41,6 +41,8 @@
 extern "C" {
 #endif
 
+#include "nptypes.h"
+
 /*
     This API is used to facilitate binding code written in C to script
     objects.  The API in this header does not assume the presence of a
@@ -380,32 +382,6 @@ bool NPN_Enumerate(NPP npp, NPObject *npobj, NPIdentifier **identifier,
 bool NPN_Construct(NPP npp, NPObject *npobj, const NPVariant *args,
                    uint32_t argCount, NPVariant *result);
 
-// Helper function for evaluating a script in the scope of the NPObject passed in.
-// Parameters
-// npp
-//  The plugin's opaque instance handle (Can be NULL)
-// popups_allowed
-//  Indicates if popups created in the context of the script being executed are
-//  blocked or not.
-// npobj
-//  The NPObject.
-// npscript
-//  The script being executed.
-// result
-//  On return contains the value returned by the script.
-// Returns true on success.
-bool NPN_EvaluateHelper(NPP npp, bool popups_allowed, NPObject* npobj, 
-                        NPString* npscript, NPVariant *result);
-
-// BEGIN GOOGLE MODIFICATIONS
-
-void* NPP_GetJavaClass(void);
-void* NPN_GetJavaEnv(void);
-void* NPN_GetJavaPeer(NPP instance);
-void NPN_PluginThreadAsyncCall(NPP id, void (*func)(void *), void *userData);
-
-// END GOOGLE MODIFICATIONS
-
 /*
     NPN_SetException may be called to trigger a script exception upon
     return from entry points into NPObjects.  Typical usage: