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

Unified Diff: net/http/http_network_transaction.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: Add a few more tests 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
Index: net/http/http_network_transaction.h
diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h
index 1b7aac87dde97a177101ea5088313ebd45219624..a3a9ef77fe613755152530d35d079da5ef6c2d08 100644
--- a/net/http/http_network_transaction.h
+++ b/net/http/http_network_transaction.h
@@ -20,6 +20,7 @@
#include "net/http/http_transaction.h"
#include "net/log/net_log.h"
#include "net/proxy/proxy_service.h"
+#include "net/socket/connection_attempts.h"
#include "net/ssl/ssl_config_service.h"
#include "net/websockets/websocket_handshake_stream_base.h"
@@ -99,6 +100,8 @@ class NET_EXPORT_PRIVATE HttpNetworkTransaction
const ProxyInfo& used_proxy_info,
HttpStream* stream) override;
+ void GetConnectionAttempts(ConnectionAttempts* out) const override;
+
private:
friend class HttpNetworkTransactionSSLTest;
@@ -257,6 +260,8 @@ class NET_EXPORT_PRIVATE HttpNetworkTransaction
void SetStream(HttpStream* stream);
+ void CopyConnectionAttemptsFromStreamRequest();
+
scoped_refptr<HttpAuthController>
auth_controllers_[HttpAuth::AUTH_NUM_TARGETS];
@@ -327,6 +332,8 @@ class NET_EXPORT_PRIVATE HttpNetworkTransaction
BeforeNetworkStartCallback before_network_start_callback_;
BeforeProxyHeadersSentCallback before_proxy_headers_sent_callback_;
+ ConnectionAttempts connection_attempts_;
+
DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction);
};

Powered by Google App Engine
This is Rietveld 408576698