Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(377)

Unified Diff: net/socket/client_socket_handle.h

Issue 1006643002: Plumb connection attempts from (non-proxy) ConnectJobs to HttpNetworkTransaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, resolve conflict Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/net.gypi ('k') | net/socket/connection_attempts.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_handle.h
diff --git a/net/socket/client_socket_handle.h b/net/socket/client_socket_handle.h
index 532aec4e7b924c52ec0bbed88b8e4e22d7b083bb..58cf4ca6709b8d72c9fb86193142cd25d8409fc2 100644
--- a/net/socket/client_socket_handle.h
+++ b/net/socket/client_socket_handle.h
@@ -12,6 +12,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "net/base/completion_callback.h"
+#include "net/base/ip_endpoint.h"
#include "net/base/load_states.h"
#include "net/base/load_timing_info.h"
#include "net/base/net_errors.h"
@@ -20,6 +21,7 @@
#include "net/http/http_response_info.h"
#include "net/log/net_log.h"
#include "net/socket/client_socket_pool.h"
+#include "net/socket/connection_attempts.h"
#include "net/socket/stream_socket.h"
namespace net {
@@ -136,6 +138,9 @@ class NET_EXPORT ClientSocketHandle {
void set_pending_http_proxy_connection(ClientSocketHandle* connection) {
pending_http_proxy_connection_.reset(connection);
}
+ void set_connection_attempts(const ConnectionAttempts& attempts) {
+ connection_attempts_ = attempts;
+ }
// Only valid if there is no |socket_|.
bool is_ssl_error() const {
@@ -151,6 +156,9 @@ class NET_EXPORT ClientSocketHandle {
ClientSocketHandle* release_pending_http_proxy_connection() {
return pending_http_proxy_connection_.release();
}
+ const ConnectionAttempts& connection_attempts() {
+ return connection_attempts_;
+ }
StreamSocket* socket() { return socket_.get(); }
@@ -200,6 +208,7 @@ class NET_EXPORT ClientSocketHandle {
bool is_ssl_error_;
HttpResponseInfo ssl_error_response_info_;
scoped_ptr<ClientSocketHandle> pending_http_proxy_connection_;
+ std::vector<ConnectionAttempt> connection_attempts_;
base::TimeTicks init_time_;
base::TimeDelta setup_time_;
« no previous file with comments | « net/net.gypi ('k') | net/socket/connection_attempts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698