Check whether to enable token binding in preconnect.cc

net/http/http_network_transaction.cc

Index: net/http/http_network_transaction.cc
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 9917c69f04b81d4326bccfbca4bce66f6f9f7b8a..9f640b27129e50141ad28eca5edb14f658c001f3 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -121,10 +121,6 @@ HttpNetworkTransaction::HttpNetworkTransaction(RequestPriority priority,
       establishing_tunnel_(false),
       websocket_handshake_stream_base_create_helper_(NULL),
       net_error_details_() {
-  session->ssl_config_service()->GetSSLConfig(&server_ssl_config_);
-  session->GetAlpnProtos(&server_ssl_config_.alpn_protos);
-  session->GetNpnProtos(&server_ssl_config_.npn_protos);
-  proxy_ssl_config_ = server_ssl_config_;
 }
 
 HttpNetworkTransaction::~HttpNetworkTransaction() {
@@ -154,22 +150,17 @@ int HttpNetworkTransaction::Start(const HttpRequestInfo* request_info,
   net_log_ = net_log;
   request_ = request_info;
 
+  // Now that we have an HttpRequestInfo object, update server_ssl_config_.
+  session_->GetSSLConfig(*request_, &server_ssl_config_);
+
   if (request_->load_flags & LOAD_DISABLE_CERT_REVOCATION_CHECKING) {
     server_ssl_config_.rev_checking_enabled = false;
-    proxy_ssl_config_.rev_checking_enabled = false;
   }

[mmenke, 2016/04/22 16:54:13]

nit:  Remove braces

+  proxy_ssl_config_ = server_ssl_config_;

[mmenke, 2016/04/22 16:54:13]

Hrm...We didn't enable channel ID on the proxy's config before, or enable
TB_PARAM_WHATEVER.  Is changing that a problem?  We're doing the same thing in
the preconnect path as well.

[nharper, 2016/04/22 19:05:02]

It looks like we unconditionally enabled channel ID on the proxy's config - the
old code here never touched procy_ssl_config_.channel_id_enabled, which defaults
to true. I feel most comfortable with not changing the behavior of it, by having
HttpNetworkSession::GetSSLConfig fill both the server and proxy SSLConfigs.

 
   if (request_->load_flags & LOAD_PREFETCH)
     response_.unused_since_prefetch = true;
 
-  // Channel ID is disabled if privacy mode is enabled for this request.
-  if (request_->privacy_mode == PRIVACY_MODE_ENABLED) {
-    server_ssl_config_.channel_id_enabled = false;
-  } else if (session_->params().enable_token_binding &&
-             session_->params().channel_id_service) {
-    server_ssl_config_.token_binding_params.push_back(TB_PARAM_ECDSAP256);
-  }
-
   next_state_ = STATE_NOTIFY_BEFORE_CREATE_STREAM;
   int rv = DoLoop(OK);
   if (rv == ERR_IO_PENDING)