Switch to standard integer types in ppapi/.

ppapi/proxy/serialized_handle.h

 // Copyright (c) 2013 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.
 
 #ifndef PPAPI_PROXY_SERIALIZED_HANDLES_H_
 #define PPAPI_PROXY_SERIALIZED_HANDLES_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
 #include "base/atomicops.h"
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/shared_memory.h"
 #include "build/build_config.h"
 #include "ipc/ipc_platform_file.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 
 namespace base {
 class Pickle;
 }
 
 namespace ppapi {
 namespace proxy {
 
 // SerializedHandle is a unified structure for holding a handle (e.g., a shared
 // memory handle, socket descriptor, etc). This is useful for passing handles in
 // resource messages and also makes it easier to translate handles in
 // NaClIPCAdapter for use in NaCl.
 class PPAPI_PROXY_EXPORT SerializedHandle {
  public:
   enum Type { INVALID, SHARED_MEMORY, SOCKET, FILE };
   // Header contains the fields that we send in IPC messages, apart from the
   // actual handle. See comments on the SerializedHandle fields below.
   struct Header {
     Header() : type(INVALID), size(0), open_flags(0) {}
     Header(Type type_arg,
-           uint32 size_arg,
-           int32 open_flags_arg,
+           uint32_t size_arg,
+           int32_t open_flags_arg,
            PP_Resource file_io_arg)
         : type(type_arg),
           size(size_arg),
           open_flags(open_flags_arg),
-          file_io(file_io_arg) {
-    }
+          file_io(file_io_arg) {}
 
     Type type;
-    uint32 size;
-    int32 open_flags;
+    uint32_t size;
+    int32_t open_flags;
     PP_Resource file_io;
   };
 
   SerializedHandle();
   // Create an invalid handle of the given type.
   explicit SerializedHandle(Type type);
 
   // Create a shared memory handle.
-  SerializedHandle(const base::SharedMemoryHandle& handle, uint32 size);
+  SerializedHandle(const base::SharedMemoryHandle& handle, uint32_t size);
 
   // Create a socket or file handle.
   SerializedHandle(const Type type,
                    const IPC::PlatformFileForTransit& descriptor);
 
   Type type() const { return type_; }
   bool is_shmem() const { return type_ == SHARED_MEMORY; }
   bool is_socket() const { return type_ == SOCKET; }
   bool is_file() const { return type_ == FILE; }
   const base::SharedMemoryHandle& shmem() const {
     DCHECK(is_shmem());
     return shm_handle_;
   }
-  uint32 size() const {
+  uint32_t size() const {
     DCHECK(is_shmem());
     return size_;
   }
   const IPC::PlatformFileForTransit& descriptor() const {
     DCHECK(is_socket() || is_file());
     return descriptor_;
   }
-  int32 open_flags() const {
-    return open_flags_;
-  }
+  int32_t open_flags() const { return open_flags_; }
   PP_Resource file_io() const {
     return file_io_;
   }
-  void set_shmem(const base::SharedMemoryHandle& handle, uint32 size) {
+  void set_shmem(const base::SharedMemoryHandle& handle, uint32_t size) {
     type_ = SHARED_MEMORY;
     shm_handle_ = handle;
     size_ = size;
 
     descriptor_ = IPC::InvalidPlatformFileForTransit();
   }
   void set_socket(const IPC::PlatformFileForTransit& socket) {
     type_ = SOCKET;
     descriptor_ = socket;
 
     shm_handle_ = base::SharedMemory::NULLHandle();
     size_ = 0;
   }
   void set_file_handle(const IPC::PlatformFileForTransit& descriptor,
-                       int32 open_flags,
+                       int32_t open_flags,
                        PP_Resource file_io) {
     type_ = FILE;
 
     descriptor_ = descriptor;
     shm_handle_ = base::SharedMemory::NULLHandle();
     size_ = 0;
     open_flags_ = open_flags;
     file_io_ = file_io;
   }
   void set_null_shmem() {
@@ skipping 23 matching lines @@
  private:
   // The kind of handle we're holding.
   Type type_;
 
   // We hold more members than we really need; we can't easily use a union,
   // because we hold non-POD types. But these types are pretty light-weight. If
   // we add more complex things later, we should come up with a more memory-
   // efficient strategy.
   // These are valid if type == SHARED_MEMORY.
   base::SharedMemoryHandle shm_handle_;
-  uint32 size_;
+  uint32_t size_;
 
   // This is valid if type == SOCKET || type == FILE.
   IPC::PlatformFileForTransit descriptor_;
 
   // The following fields are valid if type == FILE.
-  int32 open_flags_;
+  int32_t open_flags_;
   // This is non-zero if file writes require quota checking.
   PP_Resource file_io_;
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_SERIALIZED_HANDLES_H_