Move nphostapi.h to be with the rest of the NPAPI headers.

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

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

10 files changed, 343 insertions, 328 deletions

diff --git a/chrome/plugin/npobject_util.cc b/chrome/plugin/npobject_util.cc
index c0c3d10f..0c54a33 100644
--- a/chrome/plugin/npobject_util.cc
+++ b/chrome/plugin/npobject_util.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,8 +8,8 @@
 #include "chrome/common/plugin_messages.h"
 #include "chrome/plugin/npobject_proxy.h"
 #include "chrome/plugin/plugin_channel_base.h"
+#include "third_party/npapi/bindings/nphostapi.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
-#include "webkit/glue/plugins/nphostapi.h"
 #include "webkit/glue/plugins/plugin_host.h"
 #include "webkit/glue/webkit_glue.h"
 
diff --git a/third_party/npapi/bindings/nphostapi.h b/third_party/npapi/bindings/nphostapi.h
new file mode 100644
index 0000000..69bad70
--- /dev/null
+++ b/third_party/npapi/bindings/nphostapi.h
@@ -0,0 +1,325 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// TODO:  Did not implement JRIGlobalRef function yet.  Not sure if this is used?
+
+#ifndef _NPHOSTAPI_H_
+#define _NPHOSTAPI_H_
+
+#include "base/port.h"
+#include "third_party/npapi/bindings/npapi.h"
+#include "third_party/npapi/bindings/npapi_extensions.h"
+#include "third_party/npapi/bindings/npruntime.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//
+// NPAPI NPP Function Pointers
+//
+typedef NPError      (*NPP_NewProcPtr)(NPMIMEType pluginType,
+                         NPP instance,
+                         uint16 mode,
+                         int16 argc,
+                         char* argn[],
+                         char* argv[],
+                         NPSavedData* saved);
+typedef NPError      (*NPP_DestroyProcPtr)(NPP instance,
+                         NPSavedData** save);
+typedef NPError      (*NPP_SetWindowProcPtr)(NPP instance,
+                         NPWindow* window);
+typedef NPError      (*NPP_NewStreamProcPtr)(NPP instance,
+                         NPMIMEType type,
+                         NPStream* stream,
+                         NPBool seekable,
+                         uint16* stype);
+typedef NPError      (*NPP_DestroyStreamProcPtr)(NPP instance,
+                         NPStream* stream,
+                         NPReason reason);
+typedef int32        (*NPP_WriteReadyProcPtr)(NPP instance,
+                         NPStream* stream);
+typedef int32        (*NPP_WriteProcPtr)(NPP instance,
+                         NPStream* stream,
+                         int32 offset,
+                         int32 len,
+                         void* buffer);
+typedef void         (*NPP_StreamAsFileProcPtr)(NPP instance,
+                         NPStream* stream,
+                         const char* fname);
+typedef void         (*NPP_PrintProcPtr)(NPP instance,
+                         NPPrint* platformPrint);
+typedef int16        (*NPP_HandleEventProcPtr)(NPP instance,
+                         void* event);
+typedef void         (*NPP_URLNotifyProcPtr)(NPP instance,
+                         const char* url,
+                         NPReason reason,
+                         void* notifyData);
+typedef void* JRIGlobalRef; //not using this right now
+typedef NPError      (*NPP_GetValueProcPtr)(NPP instance,
+                         NPPVariable variable,
+                         void *ret_alue);
+typedef NPError      (*NPP_SetValueProcPtr)(NPP instance,
+                         NPNVariable variable,
+                         void *ret_alue);
+
+//
+// NPAPI NPN Function Pointers
+//
+typedef NPError      (*NPN_GetURLProcPtr)(NPP instance,
+                         const char* URL,
+                         const char* window);
+typedef NPError      (*NPN_PostURLProcPtr)(NPP instance,
+                         const char* URL,
+                         const char* window,
+                         uint32 len,
+                         const char* buf,
+                         NPBool file);
+typedef NPError      (*NPN_RequestReadProcPtr)(NPStream* stream,
+                         NPByteRange* rangeList);
+typedef NPError      (*NPN_NewStreamProcPtr)(NPP instance,
+                         NPMIMEType type,
+                         const char* window,
+                         NPStream** stream);
+typedef int32        (*NPN_WriteProcPtr)(NPP instance,
+                         NPStream* stream,
+                         int32 len,
+                         void* buffer);
+typedef NPError      (*NPN_DestroyStreamProcPtr)(NPP instance,
+                         NPStream* stream,
+                         NPReason reason);
+typedef void         (*NPN_StatusProcPtr)(NPP instance,
+                         const char* message);
+typedef const char*  (*NPN_UserAgentProcPtr)(NPP instance);
+typedef void*        (*NPN_MemAllocProcPtr)(uint32 size);
+typedef void         (*NPN_MemFreeProcPtr)(void* ptr);
+typedef uint32       (*NPN_MemFlushProcPtr)(uint32 size);
+typedef void         (*NPN_ReloadPluginsProcPtr)(NPBool reloadPages);
+
+typedef void*        (*NPN_GetJavaEnvProcPtr)(void);
+typedef void*        (*NPN_GetJavaPeerProcPtr)(NPP instance);
+
+typedef NPError      (*NPN_GetURLNotifyProcPtr)(NPP instance,
+                         const char* URL,
+                         const char* window,
+                         void* notifyData);
+typedef NPError      (*NPN_PostURLNotifyProcPtr)(NPP instance,
+                         const char* URL,
+                         const char* window,
+                         uint32 len,
+                         const char* buf,
+                         NPBool file,
+                         void* notifyData);
+typedef NPError      (*NPN_GetValueProcPtr)(NPP instance,
+                         NPNVariable variable,
+                         void *ret_value);
+typedef NPError      (*NPN_SetValueProcPtr)(NPP instance,
+                         NPPVariable variable,
+                         void *value);
+typedef void         (*NPN_InvalidateRectProcPtr)(NPP instance,
+                         NPRect *rect);
+typedef void         (*NPN_InvalidateRegionProcPtr)(NPP instance,
+                         NPRegion region);
+typedef void         (*NPN_ForceRedrawProcPtr)(NPP instance);
+
+typedef void         (*NPN_ReleaseVariantValueProcPtr) (NPVariant *variant);
+
+typedef NPIdentifier (*NPN_GetStringIdentifierProcPtr) (const NPUTF8 *name);
+typedef void         (*NPN_GetStringIdentifiersProcPtr) (const NPUTF8 **names,
+                         int32_t nameCount,
+                         NPIdentifier *identifiers);
+typedef NPIdentifier (*NPN_GetIntIdentifierProcPtr) (int32_t intid);
+typedef int32_t      (*NPN_IntFromIdentifierProcPtr) (NPIdentifier identifier);
+typedef bool         (*NPN_IdentifierIsStringProcPtr) (NPIdentifier identifier);
+typedef NPUTF8 *     (*NPN_UTF8FromIdentifierProcPtr) (NPIdentifier identifier);
+
+typedef NPObject*    (*NPN_CreateObjectProcPtr) (NPP,
+                         NPClass *aClass);
+typedef NPObject*    (*NPN_RetainObjectProcPtr) (NPObject *obj);
+typedef void         (*NPN_ReleaseObjectProcPtr) (NPObject *obj);
+typedef bool         (*NPN_InvokeProcPtr) (NPP npp,
+                         NPObject *obj,
+                         NPIdentifier methodName,
+                         const NPVariant *args,
+                         unsigned argCount,
+                         NPVariant *result);
+typedef bool         (*NPN_InvokeDefaultProcPtr) (NPP npp,
+                         NPObject *obj,
+                         const NPVariant *args,
+                         unsigned argCount,
+                         NPVariant *result);
+typedef bool         (*NPN_EvaluateProcPtr) (NPP npp,
+                         NPObject *obj,
+                         NPString *script,
+                         NPVariant *result);
+typedef bool         (*NPN_GetPropertyProcPtr) (NPP npp,
+                         NPObject *obj,
+                         NPIdentifier propertyName,
+                         NPVariant *result);
+typedef bool         (*NPN_SetPropertyProcPtr) (NPP npp,
+                         NPObject *obj,
+                         NPIdentifier propertyName,
+                         const NPVariant *value);
+typedef bool         (*NPN_HasPropertyProcPtr) (NPP,
+                         NPObject *npobj,
+                         NPIdentifier propertyName);
+typedef bool         (*NPN_HasMethodProcPtr) (NPP npp,
+                         NPObject *npobj,
+                         NPIdentifier methodName);
+typedef bool         (*NPN_RemovePropertyProcPtr) (NPP npp,
+                         NPObject *obj,
+                         NPIdentifier propertyName);
+typedef void         (*NPN_SetExceptionProcPtr) (NPObject *obj,
+                         const NPUTF8 *message);
+typedef void         (*NPN_PushPopupsEnabledStateProcPtr)(NPP npp,
+                         NPBool enabled);
+typedef void         (*NPN_PopPopupsEnabledStateProcPtr)(NPP npp);
+typedef bool         (*NPN_EnumerateProcPtr)(NPP npp,
+                         NPObject *obj,
+                         NPIdentifier **identifier,
+                         uint32_t *count);
+typedef void         (*NPN_PluginThreadAsyncCallProcPtr)(NPP instance,
+                         void (*func)(void *),
+                         void *userData);
+typedef bool         (*NPN_ConstructProcPtr)(NPP npp,
+                         NPObject* obj,
+                         const NPVariant *args,
+                         uint32_t argCount,
+                         NPVariant *result);
+typedef NPError      (*NPN_GetValueForURLPtr)(NPP npp,
+                         NPNURLVariable variable,
+                         const char *url,
+                         char **value,
+                         uint32_t *len);
+typedef NPError      (*NPN_SetValueForURLPtr)(NPP npp,
+                         NPNURLVariable variable,
+                         const char *url,
+                         const char *value,
+                         uint32_t len);
+typedef NPError      (*NPN_GetAuthenticationInfoPtr)(NPP npp,
+                         const char *protocol,
+                         const char *host,
+                         int32_t port,
+                         const char *scheme,
+                         const char *realm,
+                         char **username,
+                         uint32_t *ulen,
+                         char **password,
+                         uint32_t *plen);
+typedef uint32       (*NPN_ScheduleTimerPtr)(NPP npp,
+                         uint32 interval,
+                         NPBool repeat,
+                         void (*timerFunc)(NPP npp, uint32 timerID));
+typedef void         (*NPN_UnscheduleTimerPtr)(NPP npp,
+                         uint32 timerID);
+typedef NPError      (*NPN_PopUpContextMenuPtr)(NPP npp,
+                         NPMenu* menu);
+typedef NPBool       (*NPN_ConvertPointPtr)(NPP npp,
+                         double sourceX,
+                         double sourceY,
+                         NPCoordinateSpace sourceSpace,
+                         double *destX,
+                         double *destY,
+                         NPCoordinateSpace destSpace);
+
+//
+// NPAPI Function table of NPP functions (functions provided by plugin to host)
+//
+typedef struct _NPPluginFuncs {
+    unsigned short size;
+    unsigned short version;
+    NPP_NewProcPtr newp;
+    NPP_DestroyProcPtr destroy;
+    NPP_SetWindowProcPtr setwindow;
+    NPP_NewStreamProcPtr newstream;
+    NPP_DestroyStreamProcPtr destroystream;
+    NPP_StreamAsFileProcPtr asfile;
+    NPP_WriteReadyProcPtr writeready;
+    NPP_WriteProcPtr write;
+    NPP_PrintProcPtr print;
+    NPP_HandleEventProcPtr event;
+    NPP_URLNotifyProcPtr urlnotify;
+    JRIGlobalRef javaClass;
+    NPP_GetValueProcPtr getvalue;
+    NPP_SetValueProcPtr setvalue;
+} NPPluginFuncs;
+
+//
+// NPAPI Function table NPN functions (functions provided by host to plugin)
+//
+typedef struct _NPNetscapeFuncs {
+    uint16 size;
+    uint16 version;
+    NPN_GetURLProcPtr geturl;
+    NPN_PostURLProcPtr posturl;
+    NPN_RequestReadProcPtr requestread;
+    NPN_NewStreamProcPtr newstream;
+    NPN_WriteProcPtr write;
+    NPN_DestroyStreamProcPtr destroystream;
+    NPN_StatusProcPtr status;
+    NPN_UserAgentProcPtr uagent;
+    NPN_MemAllocProcPtr memalloc;
+    NPN_MemFreeProcPtr memfree;
+    NPN_MemFlushProcPtr memflush;
+    NPN_ReloadPluginsProcPtr reloadplugins;
+    NPN_GetJavaEnvProcPtr getJavaEnv;
+    NPN_GetJavaPeerProcPtr getJavaPeer;
+    NPN_GetURLNotifyProcPtr geturlnotify;
+    NPN_PostURLNotifyProcPtr posturlnotify;
+    NPN_GetValueProcPtr getvalue;
+    NPN_SetValueProcPtr setvalue;
+    NPN_InvalidateRectProcPtr invalidaterect;
+    NPN_InvalidateRegionProcPtr invalidateregion;
+    NPN_ForceRedrawProcPtr forceredraw;
+
+    NPN_GetStringIdentifierProcPtr getstringidentifier;
+    NPN_GetStringIdentifiersProcPtr getstringidentifiers;
+    NPN_GetIntIdentifierProcPtr getintidentifier;
+    NPN_IdentifierIsStringProcPtr identifierisstring;
+    NPN_UTF8FromIdentifierProcPtr utf8fromidentifier;
+    NPN_IntFromIdentifierProcPtr intfromidentifier;
+    NPN_CreateObjectProcPtr createobject;
+    NPN_RetainObjectProcPtr retainobject;
+    NPN_ReleaseObjectProcPtr releaseobject;
+    NPN_InvokeProcPtr invoke;
+    NPN_InvokeDefaultProcPtr invokeDefault;
+    NPN_EvaluateProcPtr evaluate;
+    NPN_GetPropertyProcPtr getproperty;
+    NPN_SetPropertyProcPtr setproperty;
+    NPN_RemovePropertyProcPtr removeproperty;
+    NPN_HasPropertyProcPtr hasproperty;
+    NPN_HasMethodProcPtr hasmethod;
+    NPN_ReleaseVariantValueProcPtr releasevariantvalue;
+    NPN_SetExceptionProcPtr setexception;
+    NPN_PushPopupsEnabledStateProcPtr pushpopupsenabledstate;
+    NPN_PopPopupsEnabledStateProcPtr poppopupsenabledstate;
+    NPN_EnumerateProcPtr enumerate;
+    NPN_PluginThreadAsyncCallProcPtr pluginthreadasynccall;
+    NPN_ConstructProcPtr construct;
+    NPN_GetValueForURLPtr getvalueforurl;
+    NPN_SetValueForURLPtr setvalueforurl;
+    NPN_GetAuthenticationInfoPtr getauthenticationinfo;
+    NPN_ScheduleTimerPtr scheduletimer;
+    NPN_UnscheduleTimerPtr unscheduletimer;
+    NPN_PopUpContextMenuPtr popupcontextmenu;
+    NPN_ConvertPointPtr convertpoint;
+} NPNetscapeFuncs;
+
+//
+// NPAPI library entry points
+//
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
+typedef NPError (API_CALL * NP_InitializeFunc)(NPNetscapeFuncs* pNFuncs,
+                                               NPPluginFuncs* pPFuncs);
+#else
+typedef NPError (API_CALL * NP_InitializeFunc)(NPNetscapeFuncs* pFuncs);
+typedef NPError (API_CALL * NP_GetEntryPointsFunc)(NPPluginFuncs* pFuncs);
+#endif
+typedef NPError (API_CALL * NP_ShutdownFunc)(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // _NPHOSTAPI_H_
diff --git a/third_party/npapi/npapi.gyp b/third_party/npapi/npapi.gyp
index d518240..3e761de 100644
--- a/third_party/npapi/npapi.gyp
+++ b/third_party/npapi/npapi.gyp
@@ -20,6 +20,7 @@
       'sources': [
         'bindings/npapi.h',
         'bindings/npapi_extensions.h',
+        'bindings/nphostapi.h',
         'bindings/npruntime.h',
       ],
       'conditions': [
diff --git a/webkit/default_plugin/plugin_main.h b/webkit/default_plugin/plugin_main.h
index 532d4cb..4f73651 100644
--- a/webkit/default_plugin/plugin_main.h
+++ b/webkit/default_plugin/plugin_main.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,7 +6,7 @@
 #include <string>
 
 #include "third_party/npapi/bindings/npapi.h"
-#include "webkit/glue/plugins/nphostapi.h"
+#include "third_party/npapi/bindings/nphostapi.h"
 
 namespace default_plugin {
 
diff --git a/webkit/glue/plugins/nphostapi.h b/webkit/glue/plugins/nphostapi.h
index 115c2d7..43743d6 100644
--- a/webkit/glue/plugins/nphostapi.h
+++ b/webkit/glue/plugins/nphostapi.h
@@ -1,325 +1,14 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO:  Did not implement JRIGlobalRef function yet.  Not sure if this is used?
-
 #ifndef WEBKIT_GLUE_PLUGIN_NPHOSTAPI_H__
 #define WEBKIT_GLUE_PLUGIN_NPHOSTAPI_H__
 
-#include "base/port.h"
-#include "third_party/npapi/bindings/npapi.h"
-#include "third_party/npapi/bindings/npapi_extensions.h"
-#include "third_party/npapi/bindings/npruntime.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//
-// NPAPI NPP Function Pointers
-//
-typedef NPError      (*NPP_NewProcPtr)(NPMIMEType pluginType,
-                         NPP instance,
-                         uint16 mode,
-                         int16 argc,
-                         char* argn[],
-                         char* argv[],
-                         NPSavedData* saved);
-typedef NPError      (*NPP_DestroyProcPtr)(NPP instance,
-                         NPSavedData** save);
-typedef NPError      (*NPP_SetWindowProcPtr)(NPP instance,
-                         NPWindow* window);
-typedef NPError      (*NPP_NewStreamProcPtr)(NPP instance,
-                         NPMIMEType type,
-                         NPStream* stream,
-                         NPBool seekable,
-                         uint16* stype);
-typedef NPError      (*NPP_DestroyStreamProcPtr)(NPP instance,
-                         NPStream* stream,
-                         NPReason reason);
-typedef int32        (*NPP_WriteReadyProcPtr)(NPP instance,
-                         NPStream* stream);
-typedef int32        (*NPP_WriteProcPtr)(NPP instance,
-                         NPStream* stream,
-                         int32 offset,
-                         int32 len,
-                         void* buffer);
-typedef void         (*NPP_StreamAsFileProcPtr)(NPP instance,
-                         NPStream* stream,
-                         const char* fname);
-typedef void         (*NPP_PrintProcPtr)(NPP instance,
-                         NPPrint* platformPrint);
-typedef int16        (*NPP_HandleEventProcPtr)(NPP instance,
-                         void* event);
-typedef void         (*NPP_URLNotifyProcPtr)(NPP instance,
-                         const char* url,
-                         NPReason reason,
-                         void* notifyData);
-typedef void* JRIGlobalRef; //not using this right now
-typedef NPError      (*NPP_GetValueProcPtr)(NPP instance,
-                         NPPVariable variable,
-                         void *ret_alue);
-typedef NPError      (*NPP_SetValueProcPtr)(NPP instance,
-                         NPNVariable variable,
-                         void *ret_alue);
-
-//
-// NPAPI NPN Function Pointers
-//
-typedef NPError      (*NPN_GetURLProcPtr)(NPP instance,
-                         const char* URL,
-                         const char* window);
-typedef NPError      (*NPN_PostURLProcPtr)(NPP instance,
-                         const char* URL,
-                         const char* window,
-                         uint32 len,
-                         const char* buf,
-                         NPBool file);
-typedef NPError      (*NPN_RequestReadProcPtr)(NPStream* stream,
-                         NPByteRange* rangeList);
-typedef NPError      (*NPN_NewStreamProcPtr)(NPP instance,
-                         NPMIMEType type,
-                         const char* window,
-                         NPStream** stream);
-typedef int32        (*NPN_WriteProcPtr)(NPP instance,
-                         NPStream* stream,
-                         int32 len,
-                         void* buffer);
-typedef NPError      (*NPN_DestroyStreamProcPtr)(NPP instance,
-                         NPStream* stream,
-                         NPReason reason);
-typedef void         (*NPN_StatusProcPtr)(NPP instance,
-                         const char* message);
-typedef const char*  (*NPN_UserAgentProcPtr)(NPP instance);
-typedef void*        (*NPN_MemAllocProcPtr)(uint32 size);
-typedef void         (*NPN_MemFreeProcPtr)(void* ptr);
-typedef uint32       (*NPN_MemFlushProcPtr)(uint32 size);
-typedef void         (*NPN_ReloadPluginsProcPtr)(NPBool reloadPages);
-
-typedef void*        (*NPN_GetJavaEnvProcPtr)(void);
-typedef void*        (*NPN_GetJavaPeerProcPtr)(NPP instance);
-
-typedef NPError      (*NPN_GetURLNotifyProcPtr)(NPP instance,
-                         const char* URL,
-                         const char* window,
-                         void* notifyData);
-typedef NPError      (*NPN_PostURLNotifyProcPtr)(NPP instance,
-                         const char* URL,
-                         const char* window,
-                         uint32 len,
-                         const char* buf,
-                         NPBool file,
-                         void* notifyData);
-typedef NPError      (*NPN_GetValueProcPtr)(NPP instance,
-                         NPNVariable variable,
-                         void *ret_value);
-typedef NPError      (*NPN_SetValueProcPtr)(NPP instance,
-                         NPPVariable variable,
-                         void *value);
-typedef void         (*NPN_InvalidateRectProcPtr)(NPP instance,
-                         NPRect *rect);
-typedef void         (*NPN_InvalidateRegionProcPtr)(NPP instance,
-                         NPRegion region);
-typedef void         (*NPN_ForceRedrawProcPtr)(NPP instance);
-
-typedef void         (*NPN_ReleaseVariantValueProcPtr) (NPVariant *variant);
-
-typedef NPIdentifier (*NPN_GetStringIdentifierProcPtr) (const NPUTF8 *name);
-typedef void         (*NPN_GetStringIdentifiersProcPtr) (const NPUTF8 **names,
-                         int32_t nameCount,
-                         NPIdentifier *identifiers);
-typedef NPIdentifier (*NPN_GetIntIdentifierProcPtr) (int32_t intid);
-typedef int32_t      (*NPN_IntFromIdentifierProcPtr) (NPIdentifier identifier);
-typedef bool         (*NPN_IdentifierIsStringProcPtr) (NPIdentifier identifier);
-typedef NPUTF8 *     (*NPN_UTF8FromIdentifierProcPtr) (NPIdentifier identifier);
-
-typedef NPObject*    (*NPN_CreateObjectProcPtr) (NPP,
-                         NPClass *aClass);
-typedef NPObject*    (*NPN_RetainObjectProcPtr) (NPObject *obj);
-typedef void         (*NPN_ReleaseObjectProcPtr) (NPObject *obj);
-typedef bool         (*NPN_InvokeProcPtr) (NPP npp,
-                         NPObject *obj,
-                         NPIdentifier methodName,
-                         const NPVariant *args,
-                         unsigned argCount,
-                         NPVariant *result);
-typedef bool         (*NPN_InvokeDefaultProcPtr) (NPP npp,
-                         NPObject *obj,
-                         const NPVariant *args,
-                         unsigned argCount,
-                         NPVariant *result);
-typedef bool         (*NPN_EvaluateProcPtr) (NPP npp,
-                         NPObject *obj,
-                         NPString *script,
-                         NPVariant *result);
-typedef bool         (*NPN_GetPropertyProcPtr) (NPP npp,
-                         NPObject *obj,
-                         NPIdentifier propertyName,
-                         NPVariant *result);
-typedef bool         (*NPN_SetPropertyProcPtr) (NPP npp,
-                         NPObject *obj,
-                         NPIdentifier propertyName,
-                         const NPVariant *value);
-typedef bool         (*NPN_HasPropertyProcPtr) (NPP,
-                         NPObject *npobj,
-                         NPIdentifier propertyName);
-typedef bool         (*NPN_HasMethodProcPtr) (NPP npp,
-                         NPObject *npobj,
-                         NPIdentifier methodName);
-typedef bool         (*NPN_RemovePropertyProcPtr) (NPP npp,
-                         NPObject *obj,
-                         NPIdentifier propertyName);
-typedef void         (*NPN_SetExceptionProcPtr) (NPObject *obj,
-                         const NPUTF8 *message);
-typedef void         (*NPN_PushPopupsEnabledStateProcPtr)(NPP npp,
-                         NPBool enabled);
-typedef void         (*NPN_PopPopupsEnabledStateProcPtr)(NPP npp);
-typedef bool         (*NPN_EnumerateProcPtr)(NPP npp,
-                         NPObject *obj,
-                         NPIdentifier **identifier,
-                         uint32_t *count);
-typedef void         (*NPN_PluginThreadAsyncCallProcPtr)(NPP instance,
-                         void (*func)(void *),
-                         void *userData);
-typedef bool         (*NPN_ConstructProcPtr)(NPP npp,
-                         NPObject* obj,
-                         const NPVariant *args,
-                         uint32_t argCount,
-                         NPVariant *result);
-typedef NPError      (*NPN_GetValueForURLPtr)(NPP npp,
-                         NPNURLVariable variable,
-                         const char *url,
-                         char **value,
-                         uint32_t *len);
-typedef NPError      (*NPN_SetValueForURLPtr)(NPP npp,
-                         NPNURLVariable variable,
-                         const char *url,
-                         const char *value,
-                         uint32_t len);
-typedef NPError      (*NPN_GetAuthenticationInfoPtr)(NPP npp,
-                         const char *protocol,
-                         const char *host,
-                         int32_t port,
-                         const char *scheme,
-                         const char *realm,
-                         char **username,
-                         uint32_t *ulen,
-                         char **password,
-                         uint32_t *plen);
-typedef uint32       (*NPN_ScheduleTimerPtr)(NPP npp,
-                         uint32 interval,
-                         NPBool repeat,
-                         void (*timerFunc)(NPP npp, uint32 timerID));
-typedef void         (*NPN_UnscheduleTimerPtr)(NPP npp,
-                         uint32 timerID);
-typedef NPError      (*NPN_PopUpContextMenuPtr)(NPP npp,
-                         NPMenu* menu);
-typedef NPBool       (*NPN_ConvertPointPtr)(NPP npp,
-                         double sourceX,
-                         double sourceY,
-                         NPCoordinateSpace sourceSpace,
-                         double *destX,
-                         double *destY,
-                         NPCoordinateSpace destSpace);
-
-//
-// NPAPI Function table of NPP functions (functions provided by plugin to host)
-//
-typedef struct _NPPluginFuncs {
-    unsigned short size;
-    unsigned short version;
-    NPP_NewProcPtr newp;
-    NPP_DestroyProcPtr destroy;
-    NPP_SetWindowProcPtr setwindow;
-    NPP_NewStreamProcPtr newstream;
-    NPP_DestroyStreamProcPtr destroystream;
-    NPP_StreamAsFileProcPtr asfile;
-    NPP_WriteReadyProcPtr writeready;
-    NPP_WriteProcPtr write;
-    NPP_PrintProcPtr print;
-    NPP_HandleEventProcPtr event;
-    NPP_URLNotifyProcPtr urlnotify;
-    JRIGlobalRef javaClass;
-    NPP_GetValueProcPtr getvalue;
-    NPP_SetValueProcPtr setvalue;
-} NPPluginFuncs;
-
-//
-// NPAPI Function table NPN functions (functions provided by host to plugin)
-//
-typedef struct _NPNetscapeFuncs {
-    uint16 size;
-    uint16 version;
-    NPN_GetURLProcPtr geturl;
-    NPN_PostURLProcPtr posturl;
-    NPN_RequestReadProcPtr requestread;
-    NPN_NewStreamProcPtr newstream;
-    NPN_WriteProcPtr write;
-    NPN_DestroyStreamProcPtr destroystream;
-    NPN_StatusProcPtr status;
-    NPN_UserAgentProcPtr uagent;
-    NPN_MemAllocProcPtr memalloc;
-    NPN_MemFreeProcPtr memfree;
-    NPN_MemFlushProcPtr memflush;
-    NPN_ReloadPluginsProcPtr reloadplugins;
-    NPN_GetJavaEnvProcPtr getJavaEnv;
-    NPN_GetJavaPeerProcPtr getJavaPeer;
-    NPN_GetURLNotifyProcPtr geturlnotify;
-    NPN_PostURLNotifyProcPtr posturlnotify;
-    NPN_GetValueProcPtr getvalue;
-    NPN_SetValueProcPtr setvalue;
-    NPN_InvalidateRectProcPtr invalidaterect;
-    NPN_InvalidateRegionProcPtr invalidateregion;
-    NPN_ForceRedrawProcPtr forceredraw;
-
-    NPN_GetStringIdentifierProcPtr getstringidentifier;
-    NPN_GetStringIdentifiersProcPtr getstringidentifiers;
-    NPN_GetIntIdentifierProcPtr getintidentifier;
-    NPN_IdentifierIsStringProcPtr identifierisstring;
-    NPN_UTF8FromIdentifierProcPtr utf8fromidentifier;
-    NPN_IntFromIdentifierProcPtr intfromidentifier;
-    NPN_CreateObjectProcPtr createobject;
-    NPN_RetainObjectProcPtr retainobject;
-    NPN_ReleaseObjectProcPtr releaseobject;
-    NPN_InvokeProcPtr invoke;
-    NPN_InvokeDefaultProcPtr invokeDefault;
-    NPN_EvaluateProcPtr evaluate;
-    NPN_GetPropertyProcPtr getproperty;
-    NPN_SetPropertyProcPtr setproperty;
-    NPN_RemovePropertyProcPtr removeproperty;
-    NPN_HasPropertyProcPtr hasproperty;
-    NPN_HasMethodProcPtr hasmethod;
-    NPN_ReleaseVariantValueProcPtr releasevariantvalue;
-    NPN_SetExceptionProcPtr setexception;
-    NPN_PushPopupsEnabledStateProcPtr pushpopupsenabledstate;
-    NPN_PopPopupsEnabledStateProcPtr poppopupsenabledstate;
-    NPN_EnumerateProcPtr enumerate;
-    NPN_PluginThreadAsyncCallProcPtr pluginthreadasynccall;
-    NPN_ConstructProcPtr construct;
-    NPN_GetValueForURLPtr getvalueforurl;
-    NPN_SetValueForURLPtr setvalueforurl;
-    NPN_GetAuthenticationInfoPtr getauthenticationinfo;
-    NPN_ScheduleTimerPtr scheduletimer;
-    NPN_UnscheduleTimerPtr unscheduletimer;
-    NPN_PopUpContextMenuPtr popupcontextmenu;
-    NPN_ConvertPointPtr convertpoint;
-} NPNetscapeFuncs;
-
-//
-// NPAPI library entry points
-//
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-typedef NPError (API_CALL * NP_InitializeFunc)(NPNetscapeFuncs* pNFuncs,
-                                               NPPluginFuncs* pPFuncs);
-#else
-typedef NPError (API_CALL * NP_InitializeFunc)(NPNetscapeFuncs* pFuncs);
-typedef NPError (API_CALL * NP_GetEntryPointsFunc)(NPPluginFuncs* pFuncs);
-#endif
-typedef NPError (API_CALL * NP_ShutdownFunc)(void);
+// NOTE: THIS FILE SHOULD BE DELETED! IT'S ONLY HERE BECAUSE
+// native_client\src\trusted\plugin\nacl_entry_points.cc
+// INCLUDES IT UNNECESSARILY. ONCE NACL IS UPDATED AND ROLLED, DELETE THIS FILE.
 
-#ifdef __cplusplus
-} // extern "C"
-#endif
+#include "third_party/npapi/bindings/nphostapi.h"
 
 #endif // WEBKIT_GLUE_PLUGIN_NPHOSTAPI_H__
diff --git a/webkit/glue/plugins/plugin_host.h b/webkit/glue/plugins/plugin_host.h
index 41fe0e4..85a5703 100644
--- a/webkit/glue/plugins/plugin_host.h
+++ b/webkit/glue/plugins/plugin_host.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include "base/ref_counted.h"
-#include "webkit/glue/plugins/nphostapi.h"
 #include "third_party/npapi/bindings/npapi.h"
+#include "third_party/npapi/bindings/nphostapi.h"
 
 namespace NPAPI
 {
diff --git a/webkit/glue/plugins/plugin_instance.h b/webkit/glue/plugins/plugin_instance.h
index 19e4e33..d3f0374 100644
--- a/webkit/glue/plugins/plugin_instance.h
+++ b/webkit/glue/plugins/plugin_instance.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -21,9 +21,9 @@
 #include "base/gfx/rect.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "webkit/glue/plugins/nphostapi.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/npapi/bindings/npapi.h"
+#include "third_party/npapi/bindings/nphostapi.h"
 
 class MessageLoop;
 
diff --git a/webkit/glue/plugins/plugin_list.h b/webkit/glue/plugins/plugin_list.h
index 9987553..dea1ab9 100644
--- a/webkit/glue/plugins/plugin_list.h
+++ b/webkit/glue/plugins/plugin_list.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -11,8 +11,8 @@
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/lock.h"
+#include "third_party/npapi/bindings/nphostapi.h"
 #include "webkit/glue/webplugininfo.h"
-#include "webkit/glue/plugins/nphostapi.h"
 
 class GURL;
 
diff --git a/webkit/glue/plugins/test/plugin_client.h b/webkit/glue/plugins/test/plugin_client.h
index bfe0306..a6291b0 100644
--- a/webkit/glue/plugins/test/plugin_client.h
+++ b/webkit/glue/plugins/test/plugin_client.h
@@ -5,8 +5,8 @@
 #ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_CLIENT_H__
 #define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_CLIENT_H__
 
-#include "webkit/glue/plugins/nphostapi.h"
 #include "third_party/npapi/bindings/npapi.h"
+#include "third_party/npapi/bindings/nphostapi.h"
 
 namespace NPAPIClient {
 
diff --git a/webkit/glue/plugins/test/plugin_test.h b/webkit/glue/plugins/test/plugin_test.h
index 5d26384..07bbdcd 100644
--- a/webkit/glue/plugins/test/plugin_test.h
+++ b/webkit/glue/plugins/test/plugin_test.h
@@ -8,8 +8,8 @@
 #include <string>
 
 #include "base/string_util.h"
-#include "webkit/glue/plugins/nphostapi.h"
 #include "third_party/npapi/bindings/npapi.h"
+#include "third_party/npapi/bindings/nphostapi.h"
 
 namespace NPAPIClient {