| Index: sandbox/win/src/sharedmem_ipc_server.h
|
| diff --git a/sandbox/win/src/sharedmem_ipc_server.h b/sandbox/win/src/sharedmem_ipc_server.h
|
| index cb40bca7b626f7ed6f3bcacd811aec9c8cd09eb4..5afca1d6c306a55e9f3f92b915696a34650811c1 100644
|
| --- a/sandbox/win/src/sharedmem_ipc_server.h
|
| +++ b/sandbox/win/src/sharedmem_ipc_server.h
|
| @@ -5,10 +5,12 @@
|
| #ifndef SANDBOX_SRC_SHAREDMEM_IPC_SERVER_H_
|
| #define SANDBOX_SRC_SHAREDMEM_IPC_SERVER_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <list>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/gtest_prod_util.h"
|
| +#include "base/macros.h"
|
| #include "base/win/scoped_handle.h"
|
| #include "sandbox/win/src/crosscall_params.h"
|
| #include "sandbox/win/src/crosscall_server.h"
|
| @@ -53,7 +55,7 @@ class SharedMemIPCServer {
|
|
|
| // Initializes the server structures, shared memory structures and
|
| // creates the kernels events used to signal the IPC.
|
| - bool Init(void* shared_mem, uint32 shared_size, uint32 channel_size);
|
| + bool Init(void* shared_mem, uint32_t shared_size, uint32_t channel_size);
|
|
|
| private:
|
| // Allow tests to be marked DISABLED_. Note that FLAKY_ and FAILS_ prefixes
|
| @@ -85,7 +87,7 @@ class SharedMemIPCServer {
|
| // This channel server pong event.
|
| base::win::ScopedHandle pong_event;
|
| // The size of this channel.
|
| - uint32 channel_size;
|
| + uint32_t channel_size;
|
| // The pointer to the actual channel data.
|
| char* channel_buffer;
|
| // The pointer to the base of the shared memory.
|
|
|