| Index: net/server/http_server_unittest.cc
 | 
| diff --git a/net/server/http_server_unittest.cc b/net/server/http_server_unittest.cc
 | 
| index 98571fb6a6612cffa73f3b01d5712797ed4d1bf5..ce754e8305e9a6714f005341fa01847a9d475815 100644
 | 
| --- a/net/server/http_server_unittest.cc
 | 
| +++ b/net/server/http_server_unittest.cc
 | 
| @@ -15,6 +15,7 @@
 | 
|  #include "base/format_macros.h"
 | 
|  #include "base/location.h"
 | 
|  #include "base/logging.h"
 | 
| +#include "base/macros.h"
 | 
|  #include "base/memory/ref_counted.h"
 | 
|  #include "base/memory/scoped_ptr.h"
 | 
|  #include "base/memory/weak_ptr.h"
 | 
| @@ -164,7 +165,7 @@ class TestHttpClient {
 | 
|        return false;
 | 
|  
 | 
|      // Return true if response has data equal to or more than content length.
 | 
| -    int64 body_size = static_cast<int64>(response.size()) - end_of_headers;
 | 
| +    int64_t body_size = static_cast<int64_t>(response.size()) - end_of_headers;
 | 
|      DCHECK_LE(0, body_size);
 | 
|      scoped_refptr<HttpResponseHeaders> headers(new HttpResponseHeaders(
 | 
|          HttpUtil::AssembleRawHeaders(response.data(), end_of_headers)));
 | 
| @@ -536,8 +537,10 @@ class MockStreamSocket : public StreamSocket {
 | 
|              const CompletionCallback& callback) override {
 | 
|      return ERR_NOT_IMPLEMENTED;
 | 
|    }
 | 
| -  int SetReceiveBufferSize(int32 size) override { return ERR_NOT_IMPLEMENTED; }
 | 
| -  int SetSendBufferSize(int32 size) override { return ERR_NOT_IMPLEMENTED; }
 | 
| +  int SetReceiveBufferSize(int32_t size) override {
 | 
| +    return ERR_NOT_IMPLEMENTED;
 | 
| +  }
 | 
| +  int SetSendBufferSize(int32_t size) override { return ERR_NOT_IMPLEMENTED; }
 | 
|  
 | 
|    void DidRead(const char* data, int data_len) {
 | 
|      if (!read_buf_.get()) {
 | 
| 
 |