commit 2fa640084092690f587417b0889027131d50d6fa
author nharper <nharper@chromium.org> Wed Apr 06 20:15:01 2016
committer Commit bot <commit-bot@chromium.org> Wed Apr 06 20:16:27 2016
tree 0f48282fb6722081d1d3d71511bba554ca3d3f88
parent 2bd4a2f0c0f114979d47f4498ea1bce9b091591e

Check privacy mode when enabling Token Binding

Review URL: https://codereview.chromium.org/1869553002

Cr-Commit-Position: refs/heads/master@{#385538}

net/http/http_network_transaction.cc

diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 12043644..ebbe1552 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -163,11 +163,10 @@
     response_.unused_since_prefetch = true;
 
   // Channel ID is disabled if privacy mode is enabled for this request.
-  if (request_->privacy_mode == PRIVACY_MODE_ENABLED)
+  if (request_->privacy_mode == PRIVACY_MODE_ENABLED) {
     server_ssl_config_.channel_id_enabled = false;
-
-  if (session_->params().enable_token_binding &&
-      session_->params().channel_id_service) {
+  } else if (session_->params().enable_token_binding &&
+             session_->params().channel_id_service) {
     server_ssl_config_.token_binding_params.push_back(TB_PARAM_ECDSAP256);
   }