Revert of Switch to standard integer types in sandbox/.

sandbox/win/src/target_services.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 "sandbox/win/src/target_services.h"
 
 #include <new>
 
 #include <process.h>
-#include <stdint.h>
 
+#include "base/basictypes.h"
 #include "base/win/windows_version.h"
 #include "sandbox/win/src/crosscall_client.h"
 #include "sandbox/win/src/handle_closer_agent.h"
 #include "sandbox/win/src/handle_interception.h"
 #include "sandbox/win/src/ipc_tags.h"
 #include "sandbox/win/src/process_mitigations.h"
 #include "sandbox/win/src/restricted_token_utils.h"
 #include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
 #include "sandbox/win/src/sandbox_types.h"
 #include "sandbox/win/src/sharedmem_ipc_client.h"
+#include "sandbox/win/src/sandbox_nt_util.h"
 
 namespace {
 
 // Flushing a cached key is triggered by just opening the key and closing the
 // resulting handle. RegDisablePredefinedCache() is the documented way to flush
 // HKCU so do not use it with this function.
 bool FlushRegKey(HKEY root) {
   HKEY key;
   if (ERROR_SUCCESS == ::RegOpenKeyExW(root, NULL, 0, MAXIMUM_ALLOWED, &key)) {
     if (ERROR_SUCCESS != ::RegCloseKey(key))
@@ skipping 128 matching lines @@
 // The broker services a 'test' IPC service with the IPC_PING_TAG tag.
 bool TargetServicesBase::TestIPCPing(int version) {
   void* memory = GetGlobalIPCMemory();
   if (NULL == memory) {
     return false;
   }
   SharedMemIPCClient ipc(memory);
   CrossCallReturn answer = {0};
 
   if (1 == version) {
-    uint32_t tick1 = ::GetTickCount();
-    uint32_t cookie = 717115;
+    uint32 tick1 = ::GetTickCount();
+    uint32 cookie = 717115;
     ResultCode code = CrossCall(ipc, IPC_PING1_TAG, cookie, &answer);
 
     if (SBOX_ALL_OK != code) {
       return false;
     }
     // We should get two extended returns values from the IPC, one is the
     // tick count on the broker and the other is the cookie times two.
     if ((answer.extended_count != 2)) {
       return false;
     }
     // We test the first extended answer to be within the bounds of the tick
     // count only if there was no tick count wraparound.
-    uint32_t tick2 = ::GetTickCount();
+    uint32 tick2 = ::GetTickCount();
     if (tick2 >= tick1) {
       if ((answer.extended[0].unsigned_int < tick1) ||
           (answer.extended[0].unsigned_int > tick2)) {
         return false;
       }
     }
 
     if (answer.extended[1].unsigned_int != cookie * 2) {
       return false;
     }
   } else if (2 == version) {
-    uint32_t cookie = 717111;
+    uint32 cookie = 717111;
     InOutCountedBuffer counted_buffer(&cookie, sizeof(cookie));
     ResultCode code = CrossCall(ipc, IPC_PING2_TAG, counted_buffer, &answer);
 
     if (SBOX_ALL_OK != code) {
       return false;
     }
     if (cookie != 717111 * 3) {
       return false;
     }
   } else {
@@ skipping 44 matching lines @@
 ResultCode TargetServicesBase::DuplicateHandle(HANDLE source_handle,
                                                DWORD target_process_id,
                                                HANDLE* target_handle,
                                                DWORD desired_access,
                                                DWORD options) {
   return sandbox::DuplicateHandleProxy(source_handle, target_process_id,
                                        target_handle, desired_access, options);
 }
 
 }  // namespace sandbox