| Index: remoting/host/setup/me2me_native_messaging_host_unittest.cc
|
| diff --git a/remoting/host/setup/me2me_native_messaging_host_unittest.cc b/remoting/host/setup/me2me_native_messaging_host_unittest.cc
|
| index e973d7d178a169a79560ce578a9d5d14e8869724..31a261de3797c7941a55ef91a6da4bd252f9f339 100644
|
| --- a/remoting/host/setup/me2me_native_messaging_host_unittest.cc
|
| +++ b/remoting/host/setup/me2me_native_messaging_host_unittest.cc
|
| @@ -4,10 +4,13 @@
|
|
|
| #include "remoting/host/setup/me2me_native_messaging_host.h"
|
|
|
| -#include "base/basictypes.h"
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/json/json_reader.h"
|
| #include "base/json/json_writer.h"
|
| +#include "base/macros.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| #include "base/stl_util.h"
|
| @@ -385,7 +388,7 @@ void Me2MeNativeMessagingHostTest::TearDown() {
|
| scoped_ptr<base::DictionaryValue>
|
| Me2MeNativeMessagingHostTest::ReadMessageFromOutputPipe() {
|
| while (true) {
|
| - uint32 length;
|
| + uint32_t length;
|
| int read_result = output_read_file_.ReadAtCurrentPos(
|
| reinterpret_cast<char*>(&length), sizeof(length));
|
| if (read_result != sizeof(length)) {
|
| @@ -420,7 +423,7 @@ void Me2MeNativeMessagingHostTest::WriteMessageToInputPipe(
|
| std::string message_json;
|
| base::JSONWriter::Write(message, &message_json);
|
|
|
| - uint32 length = message_json.length();
|
| + uint32_t length = message_json.length();
|
| input_write_file_.WriteAtCurrentPos(reinterpret_cast<char*>(&length),
|
| sizeof(length));
|
| input_write_file_.WriteAtCurrentPos(message_json.data(), length);
|
|
|