From 57fa7e51c52d8f4608846818eb312ac1c445fa64 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 24 Sep 2018 15:33:08 +0200 Subject: Set enable_channel_id MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Channel ID is now default off in the params constructor, but still default on as a feature in Chromium, but is deprecated and scheduled for being removed and replaced with token-binding. This patch follows the Chromium feature defaults for which of those is on or off. Change-Id: I3b9a0bc38bd42668d515d1e321c3f3b92144e986 Reviewed-by: Michael Brüning --- src/core/profile_io_data_qt.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/core') diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp index b4f35ef9b..fdd9a881c 100644 --- a/src/core/profile_io_data_qt.cpp +++ b/src/core/profile_io_data_qt.cpp @@ -41,6 +41,7 @@ #include "base/task_scheduler/post_task.h" #include "components/certificate_transparency/ct_known_logs.h" +#include "components/network_session_configurator/common/network_features.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/browsing_data_remover.h" #include "content/public/browser/cookie_store_factory.h" @@ -98,6 +99,10 @@ static bool doNetworkSessionParamsMatch(const net::HttpNetworkSession::Params &f { if (first.ignore_certificate_errors != second.ignore_certificate_errors) return false; + if (first.enable_channel_id != second.enable_channel_id) + return false; + if (first.enable_token_binding != second.enable_token_binding) + return false; return true; } @@ -147,6 +152,8 @@ static net::HttpNetworkSession::Params generateNetworkSessionParams(bool ignoreC { net::HttpNetworkSession::Params network_session_params; network_session_params.ignore_certificate_errors = ignoreCertificateErrors; + network_session_params.enable_token_binding = base::FeatureList::IsEnabled(features::kTokenBinding); + network_session_params.enable_channel_id = base::FeatureList::IsEnabled(features::kChannelID); return network_session_params; } -- cgit v1.2.3