Remove kuint32max.

sandbox/win/src/ipc_unittest.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 "base/basictypes.h"
+#include <stdint.h>
+
 #include "sandbox/win/src/crosscall_client.h"
 #include "sandbox/win/src/crosscall_server.h"
 #include "sandbox/win/src/sharedmem_ipc_client.h"
 #include "sandbox/win/src/sharedmem_ipc_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
 
 // Helper function to make the fake shared memory with some
 // basic elements initialized.
@@ skipping 135 matching lines @@
   size_t base_start = 0;
   IPCControl* client_control =
       MakeChannels(kIPCChannelSize, 4096 * 4, &base_start);
   client_control->server_alive = HANDLE(1);
   FixChannels(client_control, base_start, kIPCChannelSize, FIX_PONG_READY);
 
   char* mem = reinterpret_cast<char*>(client_control);
   SharedMemIPCClient client(mem);
 
   CrossCallReturn answer;
-  uint32 tag1 = 666;
+  uint32_t tag1 = 666;
   const wchar_t *text = L"98765 - 43210";
   base::string16 copied_text;
   CrossCallParamsEx* actual_params;
 
   CrossCall(client, tag1, text, &answer);
   actual_params = reinterpret_cast<CrossCallParamsEx*>(client.GetBuffer());
   EXPECT_EQ(1, actual_params->GetParamsCount());
   EXPECT_EQ(tag1, actual_params->GetTag());
   EXPECT_TRUE(actual_params->GetParameterStr(0, &copied_text));
   EXPECT_STREQ(text, copied_text.c_str());
 
   // Check with an empty string.
-  uint32 tag2 = 777;
+  uint32_t tag2 = 777;
   const wchar_t* null_text = NULL;
   CrossCall(client, tag2, null_text, &answer);
   actual_params = reinterpret_cast<CrossCallParamsEx*>(client.GetBuffer());
   EXPECT_EQ(1, actual_params->GetParamsCount());
   EXPECT_EQ(tag2, actual_params->GetTag());
-  uint32 param_size = 1;
+  uint32_t param_size = 1;
   ArgType type = INVALID_TYPE;
   void* param_addr = actual_params->GetRawParameter(0, &param_size, &type);
   EXPECT_TRUE(NULL != param_addr);
   EXPECT_EQ(0, param_size);
   EXPECT_EQ(WCHAR_TYPE, type);
   EXPECT_TRUE(actual_params->GetParameterStr(0, &copied_text));
 
-  uint32 tag3 = 888;
+  uint32_t tag3 = 888;
   param_size = 1;
   copied_text.clear();
 
   // Check with an empty string and a non-empty string.
   CrossCall(client, tag3, null_text, text, &answer);
   actual_params = reinterpret_cast<CrossCallParamsEx*>(client.GetBuffer());
   EXPECT_EQ(2, actual_params->GetParamsCount());
   EXPECT_EQ(tag3, actual_params->GetTag());
   type = INVALID_TYPE;
   param_addr = actual_params->GetRawParameter(0, &param_size, &type);
@@ skipping 27 matching lines @@
 }
 
 TEST(IPCTest, CrossCallIntPacking) {
   // Check handling for regular 32 bit integers used in Windows.
   size_t base_start = 0;
   IPCControl* client_control =
       MakeChannels(kIPCChannelSize, 4096 * 4, &base_start);
   client_control->server_alive = HANDLE(1);
   FixChannels(client_control, base_start, kIPCChannelSize, FIX_PONG_READY);
 
-  uint32 tag1 = 999;
-  uint32 tag2 = 111;
+  uint32_t tag1 = 999;
+  uint32_t tag2 = 111;
   const wchar_t *text = L"godzilla";
   CrossCallParamsEx* actual_params;
 
   char* mem = reinterpret_cast<char*>(client_control);
   SharedMemIPCClient client(mem);
 
   CrossCallReturn answer;
   DWORD dw = 0xE6578;
   CrossCall(client, tag2, dw, &answer);
   actual_params = reinterpret_cast<CrossCallParamsEx*>(client.GetBuffer());
   EXPECT_EQ(1, actual_params->GetParamsCount());
   EXPECT_EQ(tag2, actual_params->GetTag());
   ArgType type = INVALID_TYPE;
-  uint32 param_size = 1;
+  uint32_t param_size = 1;
   void* param_addr = actual_params->GetRawParameter(0, &param_size, &type);
   ASSERT_EQ(sizeof(dw), param_size);
   EXPECT_EQ(UINT32_TYPE, type);
   ASSERT_TRUE(NULL != param_addr);
   EXPECT_EQ(0, memcmp(&dw, param_addr, param_size));
 
   // Check handling for windows HANDLES.
   HANDLE h = HANDLE(0x70000500);
   CrossCall(client, tag1, text, h, &answer);
   actual_params = reinterpret_cast<CrossCallParamsEx*>(client.GetBuffer());
@@ skipping 30 matching lines @@
   ASSERT_TRUE(NULL != param_addr);
   EXPECT_EQ(0, memcmp(&h, param_addr, param_size));
 
   CloseChannelEvents(client_control);
   delete[] reinterpret_cast<char*>(client_control);
 }
 
 TEST(IPCTest, CrossCallValidation) {
   // First a sanity test with a well formed parameter object.
   unsigned long value = 124816;
-  const uint32 kTag = 33;
-  const uint32 kBufferSize = 256;
+  const uint32_t kTag = 33;
+  const uint32_t kBufferSize = 256;
   ActualCallParams<1, kBufferSize> params_1(kTag);
   params_1.CopyParamIn(0, &value, sizeof(value), false, UINT32_TYPE);
   void* buffer = const_cast<void*>(params_1.GetBuffer());
 
-  uint32 out_size = 0;
+  uint32_t out_size = 0;
   CrossCallParamsEx* ccp = 0;
   ccp = CrossCallParamsEx::CreateFromBuffer(buffer, params_1.GetSize(),
                                             &out_size);
   ASSERT_TRUE(NULL != ccp);
   EXPECT_TRUE(ccp->GetBuffer() != buffer);
   EXPECT_EQ(kTag, ccp->GetTag());
   EXPECT_EQ(1, ccp->GetParamsCount());
   delete[] (reinterpret_cast<char*>(ccp));
 
   // Test that we handle integer overflow on the number of params
   // correctly. We use a test-only ctor for ActualCallParams that
   // allows to create malformed cross-call buffers.
-  const int32 kPtrDiffSz = sizeof(ptrdiff_t);
-  for (int32 ix = -1; ix != 3; ++ix) {
-    uint32 fake_num_params = (kuint32max / kPtrDiffSz) + ix;
+  const int32_t kPtrDiffSz = sizeof(ptrdiff_t);
+  for (int32_t ix = -1; ix != 3; ++ix) {
+    uint32_t fake_num_params = (UINT32_MAX / kPtrDiffSz) + ix;
     ActualCallParams<1, kBufferSize> params_2(kTag, fake_num_params);
     params_2.CopyParamIn(0, &value, sizeof(value), false, UINT32_TYPE);
     buffer = const_cast<void*>(params_2.GetBuffer());
 
     EXPECT_TRUE(NULL != buffer);
     ccp = CrossCallParamsEx::CreateFromBuffer(buffer, params_1.GetSize(),
                                               &out_size);
     // If the buffer is malformed the return is NULL.
     EXPECT_TRUE(NULL == ccp);
   }
 
   ActualCallParams<1, kBufferSize> params_3(kTag, 1);
   params_3.CopyParamIn(0, &value, sizeof(value), false, UINT32_TYPE);
   buffer = const_cast<void*>(params_3.GetBuffer());
   EXPECT_TRUE(NULL != buffer);
 
-  uint32 correct_size = params_3.OverrideSize(1);
+  uint32_t correct_size = params_3.OverrideSize(1);
   ccp = CrossCallParamsEx::CreateFromBuffer(buffer, kBufferSize, &out_size);
   EXPECT_TRUE(NULL == ccp);
 
   // The correct_size is 8 bytes aligned.
   params_3.OverrideSize(correct_size - 7);
   ccp = CrossCallParamsEx::CreateFromBuffer(buffer, kBufferSize, &out_size);
   EXPECT_TRUE(NULL == ccp);
 
   params_3.OverrideSize(correct_size);
   ccp = CrossCallParamsEx::CreateFromBuffer(buffer, kBufferSize, &out_size);
@@ skipping 31 matching lines @@
   ServerEvents* events = reinterpret_cast<ServerEvents*>(param);
   DWORD wait_result = 0;
   wait_result = ::WaitForSingleObject(events->ping, INFINITE);
   ::InterlockedExchange(events->state, kAckChannel);
   ::SetEvent(events->pong);
   return wait_result;
 }
 
 class CrossCallParamsMock : public CrossCallParams {
  public:
-  CrossCallParamsMock(uint32 tag, uint32 params_count)
-      :  CrossCallParams(tag, params_count) {
-  }
+  CrossCallParamsMock(uint32_t tag, uint32_t params_count)
+      : CrossCallParams(tag, params_count) {}
 };
 
 void FakeOkAnswerInChannel(void* channel) {
   CrossCallReturn* answer = reinterpret_cast<CrossCallReturn*>(channel);
   answer->call_outcome = SBOX_ALL_OK;
 }
 
 // Create two threads that will quickly answer IPCs; the first one
 // using channel 1 (channel 0 is busy) and one using channel 0. No time-out
 // should occur.
@@ skipping 24 matching lines @@
   EXPECT_EQ(kFreeChannel, client_control->channels[2].state);
 
   void* buff1 = client.GetBuffer();
   EXPECT_TRUE(mem + client_control->channels[1].channel_base == buff1);
   EXPECT_EQ(kBusyChannel, client_control->channels[0].state);
   EXPECT_EQ(kBusyChannel, client_control->channels[1].state);
   EXPECT_EQ(kFreeChannel, client_control->channels[2].state);
 
   EXPECT_EQ(0, client_control->channels[1].ipc_tag);
 
-  uint32 tag = 7654;
+  uint32_t tag = 7654;
   CrossCallReturn answer;
   CrossCallParamsMock* params1 = new(buff1) CrossCallParamsMock(tag, 1);
   FakeOkAnswerInChannel(buff1);
 
   ResultCode result = client.DoCall(params1, &answer);
   if (SBOX_ERROR_CHANNEL_ERROR != result)
     client.FreeBuffer(buff1);
 
   EXPECT_TRUE(SBOX_ALL_OK == result);
   EXPECT_EQ(tag, client_control->channels[1].ipc_tag);
@@ skipping 78 matching lines @@
   events2.pong = events.pong;
   events2.mutex = client_control->server_alive;
 
   HANDLE t2 = ::CreateThread(NULL, 0, MainServerThread, &events2, 0, NULL);
   ASSERT_TRUE(NULL != t2);
   ::CloseHandle(t2);
 
   ::Sleep(1);
 
   void* buff0 = client.GetBuffer();
-  uint32 tag = 4321;
+  uint32_t tag = 4321;
   CrossCallReturn answer;
   CrossCallParamsMock* params1 = new(buff0) CrossCallParamsMock(tag, 1);
   FakeOkAnswerInChannel(buff0);
 
   ResultCode result = client.DoCall(params1, &answer);
   if (SBOX_ERROR_CHANNEL_ERROR != result)
     client.FreeBuffer(buff0);
 
   EXPECT_TRUE(SBOX_ALL_OK == result);
   EXPECT_EQ(tag, client_control->channels[0].ipc_tag);
@@ skipping 14 matching lines @@
   };
 
   UnitTestIPCDispatcher();
   ~UnitTestIPCDispatcher() override{};
 
   bool SetupService(InterceptionManager* manager, int service) override {
     return true;
   }
 
  private:
-  bool CallOneHandler(IPCInfo* ipc, HANDLE p1, uint32 p2) {
+  bool CallOneHandler(IPCInfo* ipc, HANDLE p1, uint32_t p2) {
     ipc->return_info.extended[0].handle = p1;
     ipc->return_info.extended[1].unsigned_int = p2;
     return true;
   }
 
-  bool CallTwoHandler(IPCInfo* ipc, HANDLE p1, uint32 p2) {
-    return true;
-  }
+  bool CallTwoHandler(IPCInfo* ipc, HANDLE p1, uint32_t p2) { return true; }
 };
 
 UnitTestIPCDispatcher::UnitTestIPCDispatcher() {
   static const IPCCall call_one = {{CALL_ONE_TAG, {VOIDPTR_TYPE, UINT32_TYPE}},
                                    reinterpret_cast<CallbackGeneric>(
                                        &UnitTestIPCDispatcher::CallOneHandler)};
   static const IPCCall call_two = {{CALL_TWO_TAG, {VOIDPTR_TYPE, UINT32_TYPE}},
                                    reinterpret_cast<CallbackGeneric>(
                                        &UnitTestIPCDispatcher::CallTwoHandler)};
   ipc_calls_.push_back(call_one);
@@ skipping 32 matching lines @@
                                                  &call_return));
   EXPECT_EQ(SBOX_ALL_OK, call_return.call_outcome);
   EXPECT_TRUE(bar == call_return.extended[0].handle);
   EXPECT_EQ(foo, call_return.extended[1].unsigned_int);
 
   CloseChannelEvents(client_control);
   delete[] reinterpret_cast<char*>(client_control);
 }
 
 }  // namespace sandbox