Simplify the logic to disable Channel IDs when privacy mode is enabled.

[email protected],[email protected]
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272125 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index cf67b1d..0188298a 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -195,9 +195,8 @@
   }
 
   // Channel ID is disabled if privacy mode is enabled for this request.
-  bool channel_id_enabled = server_ssl_config_.channel_id_enabled &&
-      (request_->privacy_mode == PRIVACY_MODE_DISABLED);
-  server_ssl_config_.channel_id_enabled = channel_id_enabled;
+  if (request_->privacy_mode == PRIVACY_MODE_ENABLED)
+    server_ssl_config_.channel_id_enabled = false;
 
   next_state_ = STATE_NOTIFY_BEFORE_CREATE_STREAM;
   int rv = DoLoop(OK);