Switch to standard integer types in content/.

content/ppapi_plugin/ppapi_thread.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/ppapi_plugin/ppapi_thread.h"
 
+#include <stddef.h>
+
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/debug/alias.h"
 #include "base/debug/crash_logging.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/memory/discardable_memory_allocator.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
+#include "build/build_config.h"
 #include "content/child/browser_font_resource_trusted.h"
 #include "content/child/child_discardable_shared_memory_manager.h"
 #include "content/child/child_process.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/sandbox_util.h"
 #include "content/ppapi_plugin/broker_process_dispatcher.h"
 #include "content/ppapi_plugin/plugin_process_dispatcher.h"
 #include "content/ppapi_plugin/ppapi_blink_platform_impl.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
@@ skipping 129 matching lines @@
     IPC_MESSAGE_HANDLER(PpapiMsg_LoadPlugin, OnLoadPlugin)
     IPC_MESSAGE_HANDLER(PpapiMsg_CreateChannel, OnCreateChannel)
     IPC_MESSAGE_HANDLER(PpapiMsg_SetNetworkState, OnSetNetworkState)
     IPC_MESSAGE_HANDLER(PpapiMsg_Crash, OnCrash)
     IPC_MESSAGE_HANDLER(PpapiMsg_Hang, OnHang)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void PpapiThread::OnChannelConnected(int32 peer_pid) {
+void PpapiThread::OnChannelConnected(int32_t peer_pid) {
   ChildThreadImpl::OnChannelConnected(peer_pid);
 #if defined(OS_WIN)
   if (is_broker_)
     peer_handle_.Set(::OpenProcess(PROCESS_DUP_HANDLE, FALSE, peer_pid));
 #endif
 }
 
 base::SingleThreadTaskRunner* PpapiThread::GetIPCTaskRunner() {
   return ChildProcess::current()->io_task_runner();
 }
@@ skipping 71 matching lines @@
     ppapi::proxy::Connection connection,
     PP_Instance instance,
     const PP_BrowserFont_Trusted_Description& desc,
     const ppapi::Preferences& prefs) {
   if (!BrowserFontResource_Trusted::IsPPFontDescriptionValid(desc))
     return 0;
   return (new BrowserFontResource_Trusted(
         connection, instance, desc, prefs))->GetReference();
 }
 
-uint32 PpapiThread::Register(
+uint32_t PpapiThread::Register(
     ppapi::proxy::PluginDispatcher* plugin_dispatcher) {
   if (!plugin_dispatcher ||
-      plugin_dispatchers_.size() >= std::numeric_limits<uint32>::max()) {
+      plugin_dispatchers_.size() >= std::numeric_limits<uint32_t>::max()) {
     return 0;
   }
 
-  uint32 id = 0;
+  uint32_t id = 0;
   do {
     // Although it is unlikely, make sure that we won't cause any trouble when
     // the counter overflows.
     id = next_plugin_dispatcher_id_++;
   } while (id == 0 ||
            plugin_dispatchers_.find(id) != plugin_dispatchers_.end());
   plugin_dispatchers_[id] = plugin_dispatcher;
   return id;
 }
 
-void PpapiThread::Unregister(uint32 plugin_dispatcher_id) {
+void PpapiThread::Unregister(uint32_t plugin_dispatcher_id) {
   plugin_dispatchers_.erase(plugin_dispatcher_id);
 }
 
 void PpapiThread::OnLoadPlugin(const base::FilePath& path,
                                const ppapi::PpapiPermissions& permissions) {
   // In case of crashes, the crash dump doesn't indicate which plugin
   // it came from.
   base::debug::SetCrashKeyValue("ppapi_path", path.MaybeAsASCII());
 
   SavePluginName(path);
@@ skipping 325 matching lines @@
           GetHistogramName(is_broker_, "LoadTime", path),
           base::TimeDelta::FromMilliseconds(1),
           base::TimeDelta::FromSeconds(10),
           50,
           base::HistogramBase::kUmaTargetedHistogramFlag);
 
   histogram->AddTime(load_time);
 }
 
 }  // namespace content