Switch to standard integer types in content/.

content/child/npapi/plugin_instance.cc

 // Copyright (c) 2012 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 "content/child/npapi/plugin_instance.h"
 
+#include <string.h>
+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/child/npapi/plugin_host.h"
@@ skipping 255 matching lines @@
                             func, user_data));
 }
 
 void PluginInstance::OnPluginThreadAsyncCall(void (*func)(void*),
                                              void* user_data) {
   // Do not invoke the callback if NPP_Destroy has already been invoked.
   if (webplugin_)
     func(user_data);
 }
 
-uint32 PluginInstance::ScheduleTimer(uint32 interval,
-                                     NPBool repeat,
-                                     void (*func)(NPP id, uint32 timer_id)) {
+uint32_t PluginInstance::ScheduleTimer(uint32_t interval,
+                                       NPBool repeat,
+                                       void (*func)(NPP id,
+                                                    uint32_t timer_id)) {
   // Use next timer id.
-  uint32 timer_id;
+  uint32_t timer_id;
   timer_id = next_timer_id_;
   ++next_timer_id_;
   DCHECK(next_timer_id_ != 0);
 
   // Record timer interval and repeat.
   TimerInfo info;
   info.interval = interval;
   info.repeat = repeat ? true : false;
   timers_[timer_id] = info;
 
   // Schedule the callback.
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&PluginInstance::OnTimerCall, this, func, npp_, timer_id),
       base::TimeDelta::FromMilliseconds(interval));
   return timer_id;
 }
 
-void PluginInstance::UnscheduleTimer(uint32 timer_id) {
+void PluginInstance::UnscheduleTimer(uint32_t timer_id) {
   // Remove info about the timer.
   TimerMap::iterator it = timers_.find(timer_id);
   if (it != timers_.end())
     timers_.erase(it);
 }
 
 #if !defined(OS_MACOSX)
 NPError PluginInstance::PopUpContextMenu(NPMenu* menu) {
   NOTIMPLEMENTED();
   return NPERR_GENERIC_ERROR;
 }
 #endif
 
-void PluginInstance::OnTimerCall(void (*func)(NPP id, uint32 timer_id),
+void PluginInstance::OnTimerCall(void (*func)(NPP id, uint32_t timer_id),
                                  NPP id,
-                                 uint32 timer_id) {
+                                 uint32_t timer_id) {
   // Do not invoke callback if the timer has been unscheduled.
   TimerMap::iterator it = timers_.find(timer_id);
   if (it == timers_.end())
     return;
 
   // Get all information about the timer before invoking the callback. The
   // callback might unschedule the timer.
   TimerInfo info = it->second;
 
   func(id, timer_id);
@@ skipping 86 matching lines @@
   if (dest_y)
     *dest_y = target_y;
   return true;
 #else
   NOTIMPLEMENTED();
   return false;
 #endif
 }
 
 }  // namespace content