Add base::Feature to control Channel ID
This change includes defaulting Channel ID to be off in //net,
with it being turned on via the network session configurator. The
network session configurator enables Channel ID if the base::Feature
is enabled, which it currently defaults to be enabled.
This also makes some changes so that when both Channel ID and Token
Binding are disabled, there will be no ChannelIDService exposed that
can be used by the extension API that provides Channel ID information.
Design doc: https://docs.google.com/document/d/1phCknRCnrad7M4cgGusLpKz5A1lLzq0oShahlMgY29Q/edit
Change-Id: Iff3cee901e5b13d4c6b10c7636a89b138ce74b78
Reviewed-on: https://chromium-review.googlesource.com/1026630
Commit-Queue: Nick Harper <[email protected]>
Reviewed-by: Ryan Hamilton <[email protected]>
Reviewed-by: Ryan Sleevi <[email protected]>
Reviewed-by: Steven Valdez <[email protected]>
Cr-Commit-Position: refs/heads/master@{#555603}diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h
index 796b289..252a16cf 100644
--- a/net/http/http_network_transaction.h
+++ b/net/http/http_network_transaction.h
@@ -130,6 +130,7 @@
FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest, ResetStateForRestart);
FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest,
CreateWebSocketHandshakeStream);
+ FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionSSLTest, ChannelID);
FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, WindowUpdateReceived);
FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, WindowUpdateSent);
FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, WindowUpdateOverflow);
