Revert of Switch to standard integer types in sandbox/.

sandbox/win/src/sharedmem_ipc_server.cc

Index: sandbox/win/src/sharedmem_ipc_server.cc
diff --git a/sandbox/win/src/sharedmem_ipc_server.cc b/sandbox/win/src/sharedmem_ipc_server.cc
index cf2d800e5dd6eb068de8b3428129344ce74d2c2a..ea1793c9dc4e9eb53a38a58cfb590b07836cd0a7 100644
--- a/sandbox/win/src/sharedmem_ipc_server.cc
+++ b/sandbox/win/src/sharedmem_ipc_server.cc
@@ -1,20 +1,17 @@
 // 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 <stddef.h>
-#include <stdint.h>
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
+#include "sandbox/win/src/sharedmem_ipc_server.h"
+#include "sandbox/win/src/sharedmem_ipc_client.h"
+#include "sandbox/win/src/sandbox.h"
+#include "sandbox/win/src/sandbox_types.h"
 #include "sandbox/win/src/crosscall_params.h"
 #include "sandbox/win/src/crosscall_server.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_types.h"
-#include "sandbox/win/src/sharedmem_ipc_client.h"
-#include "sandbox/win/src/sharedmem_ipc_server.h"
 
 namespace {
 // This handle must not be closed.
@@ -65,9 +62,8 @@
     ::UnmapViewOfFile(client_control_);
 }
 
-bool SharedMemIPCServer::Init(void* shared_mem,
-                              uint32_t shared_size,
-                              uint32_t channel_size) {
+bool SharedMemIPCServer::Init(void* shared_mem, uint32 shared_size,
+                              uint32 channel_size) {
   // The shared memory needs to be at least as big as a channel.
   if (shared_size < channel_size) {
     return false;
@@ -167,8 +163,8 @@
   if (kMaxIpcParams < params->GetParamsCount())
     return false;
 
-  for (uint32_t i = 0; i < params->GetParamsCount(); i++) {
-    uint32_t size;
+  for (uint32 i = 0; i < params->GetParamsCount(); i++) {
+    uint32 size;
     ArgType type;
     args[i] = params->GetRawParameter(i, &size, &type);
     if (args[i]) {
@@ -185,7 +181,7 @@
           break;
         }
         case UINT32_TYPE: {
-          uint32_t data;
+          uint32 data;
           if (!params->GetParameter32(i, &data)) {
             ReleaseArgs(ipc_params, args);
             return false;
@@ -224,7 +220,7 @@
                                         CrossCallReturn* call_result) {
   // Set the default error code;
   SetCallError(SBOX_ERROR_INVALID_IPC, call_result);
-  uint32_t output_size = 0;
+  uint32 output_size = 0;
   // Parse, verify and copy the message. The handler operates on a copy
   // of the message so the client cannot play dirty tricks by changing the
   // data in the channel while the IPC is being processed.
@@ -235,7 +231,7 @@
   if (!params.get())
     return false;
 
-  uint32_t tag = params->GetTag();
+  uint32 tag = params->GetTag();
   static_assert(0 == INVALID_TYPE, "incorrect type enum");
   IPCParams ipc_params = {0};
   ipc_params.ipc_tag = tag;