| Index: sandbox/win/src/crosscall_server.h
|
| diff --git a/sandbox/win/src/crosscall_server.h b/sandbox/win/src/crosscall_server.h
|
| index 824b63ef91e35ce3e2032f0e854e8532c42b1de4..9779c11f92d7f9adda93e41a872a2a5329176ddd 100644
|
| --- a/sandbox/win/src/crosscall_server.h
|
| +++ b/sandbox/win/src/crosscall_server.h
|
| @@ -7,8 +7,9 @@
|
|
|
| #include <string>
|
| #include <vector>
|
| -#include "base/basictypes.h"
|
| +
|
| #include "base/callback.h"
|
| +#include "base/macros.h"
|
| #include "base/strings/string16.h"
|
| #include "sandbox/win/src/crosscall_params.h"
|
|
|
| @@ -94,31 +95,31 @@ class CrossCallParamsEx : public CrossCallParams {
|
| // 1) validate the IPC buffer. returns NULL is the IPCbuffer is malformed.
|
| // 2) make a copy of the IPCbuffer (parameter capture)
|
| static CrossCallParamsEx* CreateFromBuffer(void* buffer_base,
|
| - uint32 buffer_size,
|
| - uint32* output_size);
|
| + uint32_t buffer_size,
|
| + uint32_t* output_size);
|
|
|
| // Provides IPCinput parameter raw access:
|
| // index : the parameter to read; 0 is the first parameter
|
| // returns NULL if the parameter is non-existent. If it exists it also
|
| // returns the size in *size
|
| - void* GetRawParameter(uint32 index, uint32* size, ArgType* type);
|
| + void* GetRawParameter(uint32_t index, uint32_t* size, ArgType* type);
|
|
|
| // Gets a parameter that is four bytes in size.
|
| // Returns false if the parameter does not exist or is not 32 bits wide.
|
| - bool GetParameter32(uint32 index, uint32* param);
|
| + bool GetParameter32(uint32_t index, uint32_t* param);
|
|
|
| // Gets a parameter that is void pointer in size.
|
| // Returns false if the parameter does not exist or is not void pointer sized.
|
| - bool GetParameterVoidPtr(uint32 index, void** param);
|
| + bool GetParameterVoidPtr(uint32_t index, void** param);
|
|
|
| // Gets a parameter that is a string. Returns false if the parameter does not
|
| // exist.
|
| - bool GetParameterStr(uint32 index, base::string16* string);
|
| + bool GetParameterStr(uint32_t index, base::string16* string);
|
|
|
| // Gets a parameter that is an in/out buffer. Returns false is the parameter
|
| // does not exist or if the size of the actual parameter is not equal to the
|
| // expected size.
|
| - bool GetParameterPtr(uint32 index, uint32 expected_size, void** pointer);
|
| + bool GetParameterPtr(uint32_t index, uint32_t expected_size, void** pointer);
|
|
|
| // Frees the memory associated with the IPC parameters.
|
| static void operator delete(void* raw_memory) throw();
|
|
|