Fix more type issues from the npapi.h tranisition to *_t types

Fixes the remaining not _t types in our plugin code
Removes the extra typedefs added to our copy of npapi.h
Adds headers to plugin code where necessary due to implicit dependencies on standard headers via basictypes.h

BUG=42645
TEST=Everything still compiles

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

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

1 files changed, 5 insertions, 5 deletions

diff --git a/webkit/default_plugin/plugin_main.h b/webkit/default_plugin/plugin_main.h
index dc1e071..50f3009 100644
--- a/webkit/default_plugin/plugin_main.h
+++ b/webkit/default_plugin/plugin_main.h
@@ -13,22 +13,22 @@ namespace default_plugin {
 extern NPNetscapeFuncs* g_browser;
 
 // Standard NPAPI functions.
-NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
+NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,
                 char* argn[], char* argv[], NPSavedData* saved);
 NPError NPP_Destroy(NPP instance, NPSavedData** save);
 NPError NPP_SetWindow(NPP instance, NPWindow* window);
 NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
-                      NPBool seekable, uint16* stype);
+                      NPBool seekable, uint16_t* stype);
 NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason);
-int32 NPP_WriteReady(NPP instance, NPStream* stream);
-int32 NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len,
+int32_t NPP_WriteReady(NPP instance, NPStream* stream);
+int32_t NPP_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len,
                 void* buffer);
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 NPError NPP_GetValue(NPP instance, NPPVariable variable, void* value);
 #endif
 void NPP_URLNotify(NPP instance, const char* url, NPReason reason,
                    void* notifyData);
-int16 NPP_HandleEvent(NPP instance, void* event);
+int16_t NPP_HandleEvent(NPP instance, void* event);
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 NPError API_CALL NP_Initialize(NPNetscapeFuncs* funcs, NPPluginFuncs* p_funcs);