diff options
author | sclittle <sclittle@chromium.org> | 2015-09-22 14:28:24 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-22 21:36:57 +0000 |
commit | 4de1bab9bbd6344709382a368cb452556544095e (patch) | |
tree | 2c85e19d1565dfc384a505587c155bd3108fabbe | |
parent | fa7da4ec8e5bd91f0162a29f076a5afbc3eb079a (diff) | |
download | chromium_src-4de1bab9bbd6344709382a368cb452556544095e.zip chromium_src-4de1bab9bbd6344709382a368cb452556544095e.tar.gz chromium_src-4de1bab9bbd6344709382a368cb452556544095e.tar.bz2 |
Change GetTotalReceivedBytes() from int64 to int64_t.
Changes GetTotalReceivedBytes() from int64 to int64_t, from the
URLRequest all the way down to the HttpStreams.
BUG=527260
TBR=pfeldman@chromium.org
Review URL: https://codereview.chromium.org/1316863007
Cr-Commit-Position: refs/heads/master@{#350239}
30 files changed, 39 insertions, 39 deletions
diff --git a/chrome/browser/devtools/devtools_network_transaction.cc b/chrome/browser/devtools/devtools_network_transaction.cc index 12881cb..af48f1c 100644 --- a/chrome/browser/devtools/devtools_network_transaction.cc +++ b/chrome/browser/devtools/devtools_network_transaction.cc @@ -211,7 +211,7 @@ bool DevToolsNetworkTransaction::GetFullRequestHeaders( return network_transaction_->GetFullRequestHeaders(headers); } -int64 DevToolsNetworkTransaction::GetTotalReceivedBytes() const { +int64_t DevToolsNetworkTransaction::GetTotalReceivedBytes() const { return network_transaction_->GetTotalReceivedBytes(); } diff --git a/chrome/browser/devtools/devtools_network_transaction.h b/chrome/browser/devtools/devtools_network_transaction.h index d50b601..167727a 100644 --- a/chrome/browser/devtools/devtools_network_transaction.h +++ b/chrome/browser/devtools/devtools_network_transaction.h @@ -93,7 +93,7 @@ class DevToolsNetworkTransaction : public net::HttpTransaction { const net::CompletionCallback& callback) override; void StopCaching() override; bool GetFullRequestHeaders(net::HttpRequestHeaders* headers) const override; - int64 GetTotalReceivedBytes() const override; + int64_t GetTotalReceivedBytes() const override; int64_t GetTotalSentBytes() const override; void DoneReading() override; const net::HttpResponseInfo* GetResponseInfo() const override; diff --git a/net/http/failing_http_transaction_factory.cc b/net/http/failing_http_transaction_factory.cc index 9603b7a..f63cd4d 100644 --- a/net/http/failing_http_transaction_factory.cc +++ b/net/http/failing_http_transaction_factory.cc @@ -50,7 +50,7 @@ class FailingHttpTransaction : public HttpTransaction { const CompletionCallback& callback) override; void StopCaching() override; bool GetFullRequestHeaders(HttpRequestHeaders* headers) const override; - int64 GetTotalReceivedBytes() const override; + int64_t GetTotalReceivedBytes() const override; int64_t GetTotalSentBytes() const override; void DoneReading() override; const HttpResponseInfo* GetResponseInfo() const override; diff --git a/net/http/http_basic_stream.cc b/net/http/http_basic_stream.cc index 42a2592..169e38c 100644 --- a/net/http/http_basic_stream.cc +++ b/net/http/http_basic_stream.cc @@ -77,7 +77,7 @@ bool HttpBasicStream::CanReuseConnection() const { return parser()->CanReuseConnection(); } -int64 HttpBasicStream::GetTotalReceivedBytes() const { +int64_t HttpBasicStream::GetTotalReceivedBytes() const { if (parser()) return parser()->received_bytes(); return 0; diff --git a/net/http/http_basic_stream.h b/net/http/http_basic_stream.h index 55b0efd4..5ece112 100644 --- a/net/http/http_basic_stream.h +++ b/net/http/http_basic_stream.h @@ -64,7 +64,7 @@ class HttpBasicStream : public HttpStream { bool CanReuseConnection() const override; - int64 GetTotalReceivedBytes() const override; + int64_t GetTotalReceivedBytes() const override; int64_t GetTotalSentBytes() const override; diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc index db3f496..9dc77b0 100644 --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc @@ -522,8 +522,8 @@ bool HttpCache::Transaction::GetFullRequestHeaders( return false; } -int64 HttpCache::Transaction::GetTotalReceivedBytes() const { - int64 total_received_bytes = total_received_bytes_; +int64_t HttpCache::Transaction::GetTotalReceivedBytes() const { + int64_t total_received_bytes = total_received_bytes_; if (network_trans_) total_received_bytes += network_trans_->GetTotalReceivedBytes(); return total_received_bytes; diff --git a/net/http/http_cache_transaction.h b/net/http/http_cache_transaction.h index 30f3ec4..303e0e3 100644 --- a/net/http/http_cache_transaction.h +++ b/net/http/http_cache_transaction.h @@ -142,7 +142,7 @@ class HttpCache::Transaction : public HttpTransaction { const CompletionCallback& callback) override; void StopCaching() override; bool GetFullRequestHeaders(HttpRequestHeaders* headers) const override; - int64 GetTotalReceivedBytes() const override; + int64_t GetTotalReceivedBytes() const override; int64_t GetTotalSentBytes() const override; void DoneReading() override; const HttpResponseInfo* GetResponseInfo() const override; @@ -470,7 +470,7 @@ class HttpCache::Transaction : public HttpTransaction { base::TimeTicks first_cache_access_since_; base::TimeTicks send_request_since_; - int64 total_received_bytes_; + int64_t total_received_bytes_; int64_t total_sent_bytes_; // Load timing information for the last network request, if any. Set in the diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index bbe48b2..f060cd7 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -387,8 +387,8 @@ bool HttpNetworkTransaction::GetFullRequestHeaders( return true; } -int64 HttpNetworkTransaction::GetTotalReceivedBytes() const { - int64 total_received_bytes = total_received_bytes_; +int64_t HttpNetworkTransaction::GetTotalReceivedBytes() const { + int64_t total_received_bytes = total_received_bytes_; if (stream_) total_received_bytes += stream_->GetTotalReceivedBytes(); return total_received_bytes; diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h index e923642..bc6ce2c 100644 --- a/net/http/http_network_transaction.h +++ b/net/http/http_network_transaction.h @@ -64,7 +64,7 @@ class NET_EXPORT_PRIVATE HttpNetworkTransaction const CompletionCallback& callback) override; void StopCaching() override; bool GetFullRequestHeaders(HttpRequestHeaders* headers) const override; - int64 GetTotalReceivedBytes() const override; + int64_t GetTotalReceivedBytes() const override; int64_t GetTotalSentBytes() const override; void DoneReading() override; const HttpResponseInfo* GetResponseInfo() const override; @@ -324,7 +324,7 @@ class NET_EXPORT_PRIVATE HttpNetworkTransaction // Total number of bytes received on all destroyed HttpStreams for this // transaction. - int64 total_received_bytes_; + int64_t total_received_bytes_; // Total number of bytes sent on all destroyed HttpStreams for this // transaction. diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 8352b82..c9e96de 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -13362,7 +13362,7 @@ class FakeStream : public HttpStream, bool CanReuseConnection() const override { return false; } - int64 GetTotalReceivedBytes() const override { + int64_t GetTotalReceivedBytes() const override { ADD_FAILURE(); return 0; } @@ -13578,7 +13578,7 @@ class FakeWebSocketBasicHandshakeStream : public WebSocketHandshakeStreamBase { bool CanReuseConnection() const override { return false; } - int64 GetTotalReceivedBytes() const override { + int64_t GetTotalReceivedBytes() const override { NOTREACHED(); return 0; } diff --git a/net/http/http_response_body_drainer_unittest.cc b/net/http/http_response_body_drainer_unittest.cc index b2defb0a..a6e3dde 100644 --- a/net/http/http_response_body_drainer_unittest.cc +++ b/net/http/http_response_body_drainer_unittest.cc @@ -101,7 +101,7 @@ class MockHttpStream : public HttpStream { bool IsConnectionReused() const override { return false; } void SetConnectionReused() override {} bool CanReuseConnection() const override { return false; } - int64 GetTotalReceivedBytes() const override { return 0; } + int64_t GetTotalReceivedBytes() const override { return 0; } int64_t GetTotalSentBytes() const override { return 0; } void GetSSLInfo(SSLInfo* ssl_info) override {} void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info) override {} diff --git a/net/http/http_stream.h b/net/http/http_stream.h index 5762339..078b7f1 100644 --- a/net/http/http_stream.h +++ b/net/http/http_stream.h @@ -118,7 +118,7 @@ class NET_EXPORT_PRIVATE HttpStream { virtual bool CanReuseConnection() const = 0; // Get the total number of bytes received from network for this stream. - virtual int64 GetTotalReceivedBytes() const = 0; + virtual int64_t GetTotalReceivedBytes() const = 0; // Get the total number of bytes sent over the network for this stream. virtual int64_t GetTotalSentBytes() const = 0; diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc index 30d93a3..b179971 100644 --- a/net/http/http_stream_factory_impl_unittest.cc +++ b/net/http/http_stream_factory_impl_unittest.cc @@ -86,7 +86,7 @@ class MockWebSocketHandshakeStream : public WebSocketHandshakeStreamBase { bool IsConnectionReused() const override { return false; } void SetConnectionReused() override {} bool CanReuseConnection() const override { return false; } - int64 GetTotalReceivedBytes() const override { return 0; } + int64_t GetTotalReceivedBytes() const override { return 0; } int64_t GetTotalSentBytes() const override { return 0; } bool GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const override { return false; diff --git a/net/http/http_stream_parser.h b/net/http/http_stream_parser.h index 548460c..f56e7de 100644 --- a/net/http/http_stream_parser.h +++ b/net/http/http_stream_parser.h @@ -85,7 +85,7 @@ class NET_EXPORT_PRIVATE HttpStreamParser { // false. bool CanReuseConnection() const; - int64 received_bytes() const { return received_bytes_; } + int64_t received_bytes() const { return received_bytes_; } int64_t sent_bytes() const { return sent_bytes_; } @@ -211,7 +211,7 @@ class NET_EXPORT_PRIVATE HttpStreamParser { // The amount of received data. If connection is reused then intermediate // value may be bigger than final. - int64 received_bytes_; + int64_t received_bytes_; // The amount of sent data. int64_t sent_bytes_; diff --git a/net/http/http_transaction.h b/net/http/http_transaction.h index b4bc415..a205602 100644 --- a/net/http/http_transaction.h +++ b/net/http/http_transaction.h @@ -124,7 +124,7 @@ class NET_EXPORT_PRIVATE HttpTransaction { virtual bool GetFullRequestHeaders(HttpRequestHeaders* headers) const = 0; // Get the number of bytes received from network. - virtual int64 GetTotalReceivedBytes() const = 0; + virtual int64_t GetTotalReceivedBytes() const = 0; // Get the number of bytes sent over the network. virtual int64_t GetTotalSentBytes() const = 0; diff --git a/net/http/http_transaction_test_util.cc b/net/http/http_transaction_test_util.cc index 926d8c6..40ae10a 100644 --- a/net/http/http_transaction_test_util.cc +++ b/net/http/http_transaction_test_util.cc @@ -325,7 +325,7 @@ bool MockNetworkTransaction::GetFullRequestHeaders( return false; } -int64 MockNetworkTransaction::GetTotalReceivedBytes() const { +int64_t MockNetworkTransaction::GetTotalReceivedBytes() const { return received_bytes_; } diff --git a/net/http/http_transaction_test_util.h b/net/http/http_transaction_test_util.h index 0c311df..202b761 100644 --- a/net/http/http_transaction_test_util.h +++ b/net/http/http_transaction_test_util.h @@ -197,7 +197,7 @@ class MockNetworkTransaction bool GetFullRequestHeaders(HttpRequestHeaders* headers) const override; - int64 GetTotalReceivedBytes() const override; + int64_t GetTotalReceivedBytes() const override; int64_t GetTotalSentBytes() const override; @@ -256,7 +256,7 @@ class MockNetworkTransaction RequestPriority priority_; CreateHelper* websocket_handshake_stream_create_helper_; base::WeakPtr<MockNetworkLayer> transaction_factory_; - int64 received_bytes_; + int64_t received_bytes_; int64_t sent_bytes_; // NetLog ID of the fake / non-existent underlying socket used by the diff --git a/net/http/proxy_connect_redirect_http_stream.cc b/net/http/proxy_connect_redirect_http_stream.cc index 8f66b82..9a03845 100644 --- a/net/http/proxy_connect_redirect_http_stream.cc +++ b/net/http/proxy_connect_redirect_http_stream.cc @@ -71,7 +71,7 @@ bool ProxyConnectRedirectHttpStream::CanReuseConnection() const { return false; } -int64 ProxyConnectRedirectHttpStream::GetTotalReceivedBytes() const { +int64_t ProxyConnectRedirectHttpStream::GetTotalReceivedBytes() const { return 0; } diff --git a/net/http/proxy_connect_redirect_http_stream.h b/net/http/proxy_connect_redirect_http_stream.h index 352f3cb..77745a0 100644 --- a/net/http/proxy_connect_redirect_http_stream.h +++ b/net/http/proxy_connect_redirect_http_stream.h @@ -48,7 +48,7 @@ class ProxyConnectRedirectHttpStream : public HttpStream { void SetConnectionReused() override; bool CanReuseConnection() const override; - int64 GetTotalReceivedBytes() const override; + int64_t GetTotalReceivedBytes() const override; int64_t GetTotalSentBytes() const override; // This function may be called. diff --git a/net/quic/quic_http_stream.cc b/net/quic/quic_http_stream.cc index dff3431..f18ef20 100644 --- a/net/quic/quic_http_stream.cc +++ b/net/quic/quic_http_stream.cc @@ -240,7 +240,7 @@ bool QuicHttpStream::CanReuseConnection() const { return false; } -int64 QuicHttpStream::GetTotalReceivedBytes() const { +int64_t QuicHttpStream::GetTotalReceivedBytes() const { // TODO(sclittle): Currently, this only includes response body bytes. Change // this to include headers and QUIC overhead as well. if (stream_) { diff --git a/net/quic/quic_http_stream.h b/net/quic/quic_http_stream.h index df88bf8..18a3fda 100644 --- a/net/quic/quic_http_stream.h +++ b/net/quic/quic_http_stream.h @@ -53,7 +53,7 @@ class NET_EXPORT_PRIVATE QuicHttpStream bool IsConnectionReused() const override; void SetConnectionReused() override; bool CanReuseConnection() const override; - int64 GetTotalReceivedBytes() const override; + int64_t GetTotalReceivedBytes() const override; int64_t GetTotalSentBytes() const override; bool GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const override; void GetSSLInfo(SSLInfo* ssl_info) override; @@ -145,7 +145,7 @@ class NET_EXPORT_PRIVATE QuicHttpStream std::string request_; // Number of bytes received when the stream was closed. - int64 closed_stream_received_bytes_; + int64_t closed_stream_received_bytes_; // Number of bytes sent when the stream was closed. int64_t closed_stream_sent_bytes_; diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc index 925e755..bf28b45 100644 --- a/net/spdy/spdy_http_stream.cc +++ b/net/spdy/spdy_http_stream.cc @@ -174,7 +174,7 @@ bool SpdyHttpStream::CanReuseConnection() const { return false; } -int64 SpdyHttpStream::GetTotalReceivedBytes() const { +int64_t SpdyHttpStream::GetTotalReceivedBytes() const { if (stream_closed_) return closed_stream_received_bytes_; diff --git a/net/spdy/spdy_http_stream.h b/net/spdy/spdy_http_stream.h index 1ad06f8..97bd72b 100644 --- a/net/spdy/spdy_http_stream.h +++ b/net/spdy/spdy_http_stream.h @@ -69,7 +69,7 @@ class NET_EXPORT_PRIVATE SpdyHttpStream : public SpdyStream::Delegate, // Total number of bytes received over the network of SPDY data, headers, and // push_promise frames associated with this stream, including the size of // frame headers, after SSL decryption and not including proxy overhead. - int64 GetTotalReceivedBytes() const override; + int64_t GetTotalReceivedBytes() const override; // Total number of bytes sent over the network of SPDY frames associated with // this stream, including the size of frame headers, before SSL encryption and // not including proxy overhead. Note that some SPDY frames such as pings are @@ -129,7 +129,7 @@ class NET_EXPORT_PRIVATE SpdyHttpStream : public SpdyStream::Delegate, LoadTimingInfo closed_stream_load_timing_info_; // After |stream_| has been closed, this keeps track of the total number of // bytes received over the network for |stream_| while it was open. - int64 closed_stream_received_bytes_; + int64_t closed_stream_received_bytes_; // After |stream_| has been closed, this keeps track of the total number of // bytes sent over the network for |stream_| while it was open. int64_t closed_stream_sent_bytes_; diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc index 09d98b1..cfacae0 100644 --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc @@ -259,7 +259,7 @@ bool URLRequest::GetFullRequestHeaders(HttpRequestHeaders* headers) const { return job_->GetFullRequestHeaders(headers); } -int64 URLRequest::GetTotalReceivedBytes() const { +int64_t URLRequest::GetTotalReceivedBytes() const { if (!job_.get()) return 0; diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h index f9b109e..6e126c3 100644 --- a/net/url_request/url_request.h +++ b/net/url_request/url_request.h @@ -361,7 +361,7 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe), // proxy handling. Pertains only to the last URLRequestJob issued by this // URLRequest, i.e. reset on redirects, but not reset when multiple roundtrips // are used for range requests or auth. - int64 GetTotalReceivedBytes() const; + int64_t GetTotalReceivedBytes() const; // Gets the total amount of data sent over the network before SSL encoding and // proxy handling. Pertains only to the last URLRequestJob issued by this diff --git a/net/url_request/url_request_http_job_unittest.cc b/net/url_request/url_request_http_job_unittest.cc index 3d73146..bca9856 100644 --- a/net/url_request/url_request_http_job_unittest.cc +++ b/net/url_request/url_request_http_job_unittest.cc @@ -658,7 +658,7 @@ class FakeWebSocketHandshakeStream : public WebSocketHandshakeStreamBase { bool CanReuseConnection() const override { return false; } - int64 GetTotalReceivedBytes() const override { return 0; } + int64_t GetTotalReceivedBytes() const override { return 0; } int64_t GetTotalSentBytes() const override { return 0; } bool GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const override { diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc index dd9bd5e..732c9d2 100644 --- a/net/url_request/url_request_job.cc +++ b/net/url_request/url_request_job.cc @@ -150,7 +150,7 @@ bool URLRequestJob::GetFullRequestHeaders(HttpRequestHeaders* headers) const { return false; } -int64 URLRequestJob::GetTotalReceivedBytes() const { +int64_t URLRequestJob::GetTotalReceivedBytes() const { return 0; } diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h index a4bb1ad..8524bf0 100644 --- a/net/url_request/url_request_job.h +++ b/net/url_request/url_request_job.h @@ -113,7 +113,7 @@ class NET_EXPORT URLRequestJob // Get the number of bytes received from network. The values returned by this // will never decrease over the lifetime of the URLRequestJob. - virtual int64 GetTotalReceivedBytes() const; + virtual int64_t GetTotalReceivedBytes() const; // Get the number of bytes sent over the network. The values returned by this // will never decrease over the lifetime of the URLRequestJob. diff --git a/net/websockets/websocket_basic_handshake_stream.cc b/net/websockets/websocket_basic_handshake_stream.cc index cdb432e..d359406 100644 --- a/net/websockets/websocket_basic_handshake_stream.cc +++ b/net/websockets/websocket_basic_handshake_stream.cc @@ -408,7 +408,7 @@ bool WebSocketBasicHandshakeStream::CanReuseConnection() const { return false; } -int64 WebSocketBasicHandshakeStream::GetTotalReceivedBytes() const { +int64_t WebSocketBasicHandshakeStream::GetTotalReceivedBytes() const { return 0; } diff --git a/net/websockets/websocket_basic_handshake_stream.h b/net/websockets/websocket_basic_handshake_stream.h index 9352d30..7f03fb1 100644 --- a/net/websockets/websocket_basic_handshake_stream.h +++ b/net/websockets/websocket_basic_handshake_stream.h @@ -57,7 +57,7 @@ class NET_EXPORT_PRIVATE WebSocketBasicHandshakeStream bool IsConnectionReused() const override; void SetConnectionReused() override; bool CanReuseConnection() const override; - int64 GetTotalReceivedBytes() const override; + int64_t GetTotalReceivedBytes() const override; int64_t GetTotalSentBytes() const override; bool GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const override; void GetSSLInfo(SSLInfo* ssl_info) override; |