| Index: net/http/http_stream_parser_unittest.cc
 | 
| diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc
 | 
| index 77da8b2000463617fb45865ab08a2d8fab8233af..2651edc2703d7131699d2b8136ec48f3132b3304 100644
 | 
| --- a/net/http/http_stream_parser_unittest.cc
 | 
| +++ b/net/http/http_stream_parser_unittest.cc
 | 
| @@ -1035,12 +1035,12 @@ TEST(HttpStreamParser, ReceivedBytesNormal) {
 | 
|    get_runner.AddRead(response);
 | 
|    get_runner.SetupParserAndSendRequest();
 | 
|    get_runner.ReadHeaders();
 | 
| -  int64 headers_size = headers.size();
 | 
| +  int64_t headers_size = headers.size();
 | 
|    EXPECT_EQ(headers_size, get_runner.parser()->received_bytes());
 | 
|    int body_size = body.size();
 | 
|    int read_lengths[] = {body_size, 0};
 | 
|    get_runner.ReadBody(body_size, read_lengths);
 | 
| -  int64 response_size = response.size();
 | 
| +  int64_t response_size = response.size();
 | 
|    EXPECT_EQ(response_size, get_runner.parser()->received_bytes());
 | 
|  }
 | 
|  
 | 
| @@ -1059,14 +1059,14 @@ TEST(HttpStreamParser, ReceivedBytesExcludesNextResponse) {
 | 
|    get_runner.SetupParserAndSendRequest();
 | 
|    get_runner.ReadHeaders();
 | 
|    EXPECT_EQ(39, get_runner.parser()->received_bytes());
 | 
| -  int64 headers_size = headers.size();
 | 
| +  int64_t headers_size = headers.size();
 | 
|    EXPECT_EQ(headers_size, get_runner.parser()->received_bytes());
 | 
|    int body_size = body.size();
 | 
|    int read_lengths[] = {body_size, 0};
 | 
|    get_runner.ReadBody(body_size, read_lengths);
 | 
| -  int64 response_size = response.size();
 | 
| +  int64_t response_size = response.size();
 | 
|    EXPECT_EQ(response_size, get_runner.parser()->received_bytes());
 | 
| -  int64 next_response_size = next_response.size();
 | 
| +  int64_t next_response_size = next_response.size();
 | 
|    EXPECT_EQ(next_response_size, get_runner.read_buffer()->offset());
 | 
|  }
 | 
|  
 | 
| @@ -1080,7 +1080,7 @@ TEST(HttpStreamParser, ReceivedBytesExcludesNextResponse) {
 | 
|  TEST(HttpStreamParser, ReceivedBytesMultiReadExcludesNextResponse) {
 | 
|    std::string headers = "HTTP/1.1 200 OK\r\n"
 | 
|        "Content-Length: 36\r\n\r\n";
 | 
| -  int64 user_buf_len = 32;
 | 
| +  int64_t user_buf_len = 32;
 | 
|    std::string body_start = std::string(user_buf_len, '#');
 | 
|    int body_start_size = body_start.size();
 | 
|    EXPECT_EQ(user_buf_len, body_start_size);
 | 
| @@ -1094,14 +1094,14 @@ TEST(HttpStreamParser, ReceivedBytesMultiReadExcludesNextResponse) {
 | 
|    get_runner.AddRead(response_end);
 | 
|    get_runner.SetupParserAndSendRequest();
 | 
|    get_runner.ReadHeaders();
 | 
| -  int64 headers_size = headers.size();
 | 
| +  int64_t headers_size = headers.size();
 | 
|    EXPECT_EQ(headers_size, get_runner.parser()->received_bytes());
 | 
|    int body_end_size = body_end.size();
 | 
|    int read_lengths[] = {body_start_size, body_end_size, 0};
 | 
|    get_runner.ReadBody(body_start_size, read_lengths);
 | 
| -  int64 response_size = response_start.size() + body_end_size;
 | 
| +  int64_t response_size = response_start.size() + body_end_size;
 | 
|    EXPECT_EQ(response_size, get_runner.parser()->received_bytes());
 | 
| -  int64 next_response_size = next_response.size();
 | 
| +  int64_t next_response_size = next_response.size();
 | 
|    EXPECT_EQ(next_response_size, get_runner.read_buffer()->offset());
 | 
|  }
 | 
|  
 | 
| @@ -1121,14 +1121,14 @@ TEST(HttpStreamParser, ReceivedBytesFromReadBufExcludesNextResponse) {
 | 
|    get_runner.AddInitialData(data);
 | 
|    get_runner.SetupParserAndSendRequest();
 | 
|    get_runner.ReadHeaders();
 | 
| -  int64 headers_size = headers.size();
 | 
| +  int64_t headers_size = headers.size();
 | 
|    EXPECT_EQ(headers_size, get_runner.parser()->received_bytes());
 | 
|    int body_size = body.size();
 | 
|    int read_lengths[] = {body_size, 0};
 | 
|    get_runner.ReadBody(body_size, read_lengths);
 | 
| -  int64 response_size = response.size();
 | 
| +  int64_t response_size = response.size();
 | 
|    EXPECT_EQ(response_size, get_runner.parser()->received_bytes());
 | 
| -  int64 next_response_size = next_response.size();
 | 
| +  int64_t next_response_size = next_response.size();
 | 
|    EXPECT_EQ(next_response_size, get_runner.read_buffer()->offset());
 | 
|  }
 | 
|  
 | 
| @@ -1137,7 +1137,7 @@ TEST(HttpStreamParser, ReceivedBytesFromReadBufExcludesNextResponse) {
 | 
|  TEST(HttpStreamParser, ReceivedBytesUseReadBuf) {
 | 
|    std::string buffer = "HTTP/1.1 200 OK\r\n";
 | 
|    std::string remaining_headers = "Content-Length: 7\r\n\r\n";
 | 
| -  int64 headers_size = buffer.size() + remaining_headers.size();
 | 
| +  int64_t headers_size = buffer.size() + remaining_headers.size();
 | 
|    std::string body = "content";
 | 
|    std::string response = remaining_headers + body;
 | 
|  
 | 
| @@ -1172,9 +1172,9 @@ TEST(HttpStreamParser, ReceivedBytesChunkedTransferExcludesNextResponse) {
 | 
|    get_runner.ReadHeaders();
 | 
|    int read_lengths[] = {4, 3, 6, 2, 6, 0};
 | 
|    get_runner.ReadBody(7, read_lengths);
 | 
| -  int64 response_size = response.size();
 | 
| +  int64_t response_size = response.size();
 | 
|    EXPECT_EQ(response_size, get_runner.parser()->received_bytes());
 | 
| -  int64 next_response_size = next_response.size();
 | 
| +  int64_t next_response_size = next_response.size();
 | 
|    EXPECT_EQ(next_response_size, get_runner.read_buffer()->offset());
 | 
|  }
 | 
|  
 | 
| @@ -1200,11 +1200,11 @@ TEST(HttpStreamParser, ReceivedBytesMultipleReads) {
 | 
|      get_runner.AddRead(blocks[i]);
 | 
|    get_runner.SetupParserAndSendRequest();
 | 
|    get_runner.ReadHeaders();
 | 
| -  int64 headers_size = headers.size();
 | 
| +  int64_t headers_size = headers.size();
 | 
|    EXPECT_EQ(headers_size, get_runner.parser()->received_bytes());
 | 
|    int read_lengths[] = {1, 4, 4, 4, 4, 4, 4, 4, 4, 0};
 | 
|    get_runner.ReadBody(receive_length + 1, read_lengths);
 | 
| -  int64 response_size = response.size();
 | 
| +  int64_t response_size = response.size();
 | 
|    EXPECT_EQ(response_size, get_runner.parser()->received_bytes());
 | 
|  }
 | 
|  
 | 
| @@ -1213,7 +1213,7 @@ TEST(HttpStreamParser, ReceivedBytesIncludesContinueHeader) {
 | 
|    std::string status100 = "HTTP/1.1 100 OK\r\n\r\n";
 | 
|    std::string headers = "HTTP/1.1 200 OK\r\n"
 | 
|        "Content-Length: 7\r\n\r\n";
 | 
| -  int64 headers_size = status100.size() + headers.size();
 | 
| +  int64_t headers_size = status100.size() + headers.size();
 | 
|    std::string body = "content";
 | 
|    std::string response = headers + body;
 | 
|  
 | 
| @@ -1223,12 +1223,12 @@ TEST(HttpStreamParser, ReceivedBytesIncludesContinueHeader) {
 | 
|    get_runner.SetupParserAndSendRequest();
 | 
|    get_runner.ReadHeaders();
 | 
|    EXPECT_EQ(100, get_runner.response_info()->headers->response_code());
 | 
| -  int64 status100_size = status100.size();
 | 
| +  int64_t status100_size = status100.size();
 | 
|    EXPECT_EQ(status100_size, get_runner.parser()->received_bytes());
 | 
|    get_runner.ReadHeaders();
 | 
|    EXPECT_EQ(200, get_runner.response_info()->headers->response_code());
 | 
|    EXPECT_EQ(headers_size, get_runner.parser()->received_bytes());
 | 
| -  int64 response_size = headers_size + body.size();
 | 
| +  int64_t response_size = headers_size + body.size();
 | 
|    int body_size = body.size();
 | 
|    int read_lengths[] = {body_size, 0};
 | 
|    get_runner.ReadBody(body_size, read_lengths);
 | 
| 
 |