| Index: net/quic/reliable_quic_stream.h
 | 
| diff --git a/net/quic/reliable_quic_stream.h b/net/quic/reliable_quic_stream.h
 | 
| index 6040198c4582050c286afadb3bcc1c4e8709c934..dfb86b3185787335df69a14219850436546d5977 100644
 | 
| --- a/net/quic/reliable_quic_stream.h
 | 
| +++ b/net/quic/reliable_quic_stream.h
 | 
| @@ -17,12 +17,14 @@
 | 
|  #ifndef NET_QUIC_RELIABLE_QUIC_STREAM_H_
 | 
|  #define NET_QUIC_RELIABLE_QUIC_STREAM_H_
 | 
|  
 | 
| +#include <stddef.h>
 | 
| +#include <stdint.h>
 | 
|  #include <sys/types.h>
 | 
|  
 | 
|  #include <list>
 | 
|  #include <string>
 | 
|  
 | 
| -#include "base/basictypes.h"
 | 
| +#include "base/macros.h"
 | 
|  #include "base/memory/ref_counted.h"
 | 
|  #include "base/strings/string_piece.h"
 | 
|  #include "net/base/iovec.h"
 | 
| @@ -112,10 +114,10 @@ class NET_EXPORT_PRIVATE ReliableQuicStream {
 | 
|    bool fin_received() { return fin_received_; }
 | 
|    bool fin_sent() { return fin_sent_; }
 | 
|  
 | 
| -  uint64 queued_data_bytes() const { return queued_data_bytes_; }
 | 
| +  uint64_t queued_data_bytes() const { return queued_data_bytes_; }
 | 
|  
 | 
| -  uint64 stream_bytes_read() const { return stream_bytes_read_; }
 | 
| -  uint64 stream_bytes_written() const { return stream_bytes_written_; }
 | 
| +  uint64_t stream_bytes_read() const { return stream_bytes_read_; }
 | 
| +  uint64_t stream_bytes_written() const { return stream_bytes_written_; }
 | 
|  
 | 
|    void set_fin_sent(bool fin_sent) { fin_sent_ = fin_sent; }
 | 
|    void set_fin_received(bool fin_received) { fin_received_ = fin_received; }
 | 
| @@ -248,7 +250,7 @@ class NET_EXPORT_PRIVATE ReliableQuicStream {
 | 
|  
 | 
|    std::list<PendingData> queued_data_;
 | 
|    // How many bytes are queued?
 | 
| -  uint64 queued_data_bytes_;
 | 
| +  uint64_t queued_data_bytes_;
 | 
|  
 | 
|    QuicStreamSequencer sequencer_;
 | 
|    QuicStreamId id_;
 | 
| @@ -256,8 +258,8 @@ class NET_EXPORT_PRIVATE ReliableQuicStream {
 | 
|    QuicSession* session_;
 | 
|    // Bytes read and written refer to payload bytes only: they do not include
 | 
|    // framing, encryption overhead etc.
 | 
| -  uint64 stream_bytes_read_;
 | 
| -  uint64 stream_bytes_written_;
 | 
| +  uint64_t stream_bytes_read_;
 | 
| +  uint64_t stream_bytes_written_;
 | 
|  
 | 
|    // Stream error code received from a RstStreamFrame or error code sent by the
 | 
|    // visitor or sequencer in the RstStreamFrame.
 | 
| 
 |