| Index: net/socket/ssl_server_socket_unittest.cc
|
| diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc
|
| index 548f7c6c99856c583bec26f6085ad8d1cbdda87b..c6937b986b8884df272e8668536abe6b91b1b093 100644
|
| --- a/net/socket/ssl_server_socket_unittest.cc
|
| +++ b/net/socket/ssl_server_socket_unittest.cc
|
| @@ -25,6 +25,7 @@
|
| #include "base/files/file_util.h"
|
| #include "base/location.h"
|
| #include "base/logging.h"
|
| +#include "base/macros.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/thread_task_runner_handle.h"
|
| @@ -191,9 +192,9 @@ class FakeSocket : public StreamSocket {
|
| return outgoing_->Write(buf, buf_len, callback);
|
| }
|
|
|
| - int SetReceiveBufferSize(int32 size) override { return OK; }
|
| + int SetReceiveBufferSize(int32_t size) override { return OK; }
|
|
|
| - int SetSendBufferSize(int32 size) override { return OK; }
|
| + int SetSendBufferSize(int32_t size) override { return OK; }
|
|
|
| int Connect(const CompletionCallback& callback) override { return OK; }
|
|
|
| @@ -325,10 +326,10 @@ class SSLServerSocketTest : public PlatformTest {
|
| base::FilePath key_path = certs_dir.AppendASCII("unittest.key.bin");
|
| std::string key_string;
|
| ASSERT_TRUE(base::ReadFileToString(key_path, &key_string));
|
| - std::vector<uint8> key_vector(
|
| - reinterpret_cast<const uint8*>(key_string.data()),
|
| - reinterpret_cast<const uint8*>(key_string.data() +
|
| - key_string.length()));
|
| + std::vector<uint8_t> key_vector(
|
| + reinterpret_cast<const uint8_t*>(key_string.data()),
|
| + reinterpret_cast<const uint8_t*>(key_string.data() +
|
| + key_string.length()));
|
|
|
| scoped_ptr<crypto::RSAPrivateKey> private_key(
|
| crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_vector));
|
|
|