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

webkit/default_plugin/plugin_main.cc

 // Copyright (c) 2006-2008 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.
 
 #include "webkit/default_plugin/plugin_main.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "webkit/default_plugin/plugin_impl.h"
 #include "webkit/glue/webkit_glue.h"
@@ skipping 83 matching lines @@
                       &script_string, &result_var);
   g_browser->releaseobject(window_obj);
 }
 
 }  // namespace CHROMIUM_DefaultPluginTest
 
 bool NegotiateModels(NPP instance) {
 #if defined(OS_MACOSX)
   NPError err;
   // Set drawing model to core graphics
-  NPBool supportsCoreGraphics = FALSE;
+  NPBool supportsCoreGraphics = false;
   err = g_browser->getvalue(instance,
                             NPNVsupportsCoreGraphicsBool,
                             &supportsCoreGraphics);
   if (err != NPERR_NO_ERROR || !supportsCoreGraphics) {
     NOTREACHED();
     return false;
   }
   err = g_browser->setvalue(instance,
                             NPPVpluginDrawingModel,
                             (void*)NPDrawingModelCoreGraphics);
   if (err != NPERR_NO_ERROR) {
     NOTREACHED();
     return false;
   }
 
   // Set event model to cocoa
-  NPBool supportsCocoaEvents = FALSE;
+  NPBool supportsCocoaEvents = false;
   err = g_browser->getvalue(instance,
                             NPNVsupportsCocoaBool,
                             &supportsCocoaEvents);
   if (err != NPERR_NO_ERROR || !supportsCocoaEvents) {
     NOTREACHED();
     return false;
   }
   err = g_browser->setvalue(instance,
                             NPPVpluginEventModel,
                             (void*)NPEventModelCocoa);
   if (err != NPERR_NO_ERROR) {
     NOTREACHED();
     return false;
   }
 #elif defined(OS_POSIX)
   NPError err;
   // Check that chrome still supports xembed.
-  NPBool supportsXEmbed = FALSE;
+  NPBool supportsXEmbed = false;
   err = g_browser->getvalue(instance,
                             NPNVSupportsXEmbedBool,
                             &supportsXEmbed);
   if (err != NPERR_NO_ERROR || !supportsXEmbed) {
     NOTREACHED();
     return false;
   }
 
   // Check that the toolkit is still gtk2.
   NPNToolkitType toolkit;
   err = g_browser->getvalue(instance,
                             NPNVToolkit,
                             &toolkit);
   if (err != NPERR_NO_ERROR || toolkit != NPNVGtk2) {
     NOTREACHED();
     return false;
   }
 #endif
   return true;
 }
 
-NPError NPP_New(NPMIMEType plugin_type, NPP instance, uint16 mode, int16 argc,
+NPError NPP_New(NPMIMEType plugin_type, NPP instance, uint16_t mode, int16_t argc,
                 char* argn[], char* argv[], NPSavedData* saved) {
   if (instance == NULL)
     return NPERR_INVALID_INSTANCE_ERROR;
 
   // We don't want the null plugin to work in the following cases:-
   // 1. Test-shell
   // 2. The plugin is running in the renderer process.
   if (webkit_glue::IsPluginRunningInRendererProcess()) {
     return NPERR_GENERIC_ERROR;
   }
 
   if (!NegotiateModels(instance))
     return NPERR_INCOMPATIBLE_VERSION_ERROR;
-  
+
   PluginInstallerImpl* plugin_impl = new PluginInstallerImpl(mode);
   plugin_impl->Initialize(
 #if defined(OS_WIN)
                           GetCurrentModuleHandle(),
 #else
                           NULL,
 #endif
                           instance, plugin_type, argc,
                           argn, argv);
 
@@ skipping 38 matching lines @@
 
   if (!plugin_impl->NPP_SetWindow(window_info)) {
     delete plugin_impl;
     return NPERR_GENERIC_ERROR;
   }
 
   return NPERR_NO_ERROR;
 }
 
 NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
-                      NPBool seekable, uint16* stype) {
+                      NPBool seekable, uint16_t* stype) {
   if (instance == NULL)
     return NPERR_INVALID_INSTANCE_ERROR;
 
   PluginInstallerImpl* plugin_impl =
     reinterpret_cast<PluginInstallerImpl*>(instance->pdata);
 
   if (!plugin_impl) {
     NOTREACHED();
     return NPERR_INVALID_INSTANCE_ERROR;
   }
@@ skipping 11 matching lines @@
 
   if (!plugin_impl) {
     NOTREACHED();
     return NPERR_INVALID_INSTANCE_ERROR;
   }
 
   plugin_impl->DestroyStream(stream, reason);
   return NPERR_NO_ERROR;
 }
 
-int32 NPP_WriteReady(NPP instance, NPStream* stream) {
+int32_t NPP_WriteReady(NPP instance, NPStream* stream) {
   if (instance == NULL)
     return 0;
 
   PluginInstallerImpl* plugin_impl =
       reinterpret_cast<PluginInstallerImpl*>(instance->pdata);
 
   if (!plugin_impl) {
     NOTREACHED();
     return 0;
   }
 
   if (plugin_impl->WriteReady(stream))
     return 0x7FFFFFFF;
   return 0;
 }
 
-int32 NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len,
+int32_t NPP_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len,
                 void* buffer) {
   if (instance == NULL)
     return 0;
 
   PluginInstallerImpl* plugin_impl =
       reinterpret_cast<PluginInstallerImpl*>(instance->pdata);
 
   if (!plugin_impl) {
     NOTREACHED();
     return 0;
@@ skipping 14 matching lines @@
     }
 
     plugin_impl->URLNotify(url, reason);
   }
 }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 NPError NPP_GetValue(NPP instance, NPPVariable variable, void* value) {
   switch (variable) {
     case NPPVpluginNeedsXEmbed:
-      *static_cast<NPBool*>(value) = TRUE;
+      *static_cast<NPBool*>(value) = true;
       return NPERR_NO_ERROR;
     default:
       return NPERR_INVALID_PARAM;
   }
 }
 #endif
 
-int16 NPP_HandleEvent(NPP instance, void* event) {
+int16_t NPP_HandleEvent(NPP instance, void* event) {
   if (instance == NULL)
     return 0;
 
   PluginInstallerImpl* plugin_impl =
       reinterpret_cast<PluginInstallerImpl*>(instance->pdata);
 
   return plugin_impl->NPP_HandleEvent(event);
 }
 
 }   // default_plugin