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

third_party/npapi/bindings/npapi.h

 /* -*- 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,
@@ skipping 33 matching lines @@
 
 /* BEGIN GOOGLE MODIFICATIONS */
 
 #ifndef __native_client__
 #include "nptypes.h"
 #endif
 
 #ifdef __native_client__
 #include <stdint.h>
 #include <sys/types.h>
-/* typedefs needed for NaCl DEPS update */
-/* TODO: convert npapi_extensions.h to int32_t, etc */
-/* and remove these typedefs */
-#ifndef _INT32
-#define _INT32
-typedef int                 int32;
-#endif
-#ifndef _UINT32
-#define _UINT32
-typedef unsigned int       uint32;
-#endif
-#ifndef _INT16
-#define _INT16
-typedef short               int16;
-#endif
-#ifndef _UINT16
-#define _UINT16
-typedef unsigned short     uint16;
-#endif
 #else
 #include "base/basictypes.h"
 #endif  /* __native_client__ */
 
 /* END GOOGLE MODIFICATIONS */
 
 #if defined(__OS2__) || defined(OS2)
 #ifndef XP_OS2
 #define XP_OS2 1
 #endif
@@ skipping 812 matching lines @@
 #ifdef __cplusplus
 }  /* end extern "C" */
 #endif
 
 #endif /* RC_INVOKED */
 #if defined(__OS2__)
 #pragma pack()
 #endif
 
 #endif /* npapi_h_ */