diff options
| author | mef@chromium.org <mef@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 18:01:40 +0000 |
|---|---|---|
| committer | mef@chromium.org <mef@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 18:01:40 +0000 |
| commit | e6d017658f1f60b06eebff1b0ac5ba6751b8daa7 (patch) | |
| tree | 570100639ba4ce142591694b297b0218d55e54a5 /jingle | |
| parent | 8fcb7fa663d0ec60859e931c01929baa64ee47e4 (diff) | |
| download | chromium_src-e6d017658f1f60b06eebff1b0ac5ba6751b8daa7.zip chromium_src-e6d017658f1f60b06eebff1b0ac5ba6751b8daa7.tar.gz chromium_src-e6d017658f1f60b06eebff1b0ac5ba6751b8daa7.tar.bz2 | |
ChannelID-less Connections in Chrome should be more granular.
Added enum PrivacyMode (Enabled/Disabled) to mark connections which should not use ChannelID even if it is globally enabled.
PrivacyMode is enabled if user blocks sending or saving cookies to/from particular server, taking in account third party cookie settings as well. See crbug.com/223191 for design doc.
Segmented client socket pools according to privacy mode setting used for particular connection (added 'pm/' prefix to pool key. Introduced SpdySessionKey structure and added PrivacyMode to the key of SpdySessionPool.
Added propagation of Privacy Mode setting from Web Sockets. Added check of Privacy Mode to predictor and pre-connect logic.
BUG=223191
TEST=unit_tests gtest_filter=ChromeNetworkDelegatePrivacyModeTest*
Review URL: https://chromiumcodereview.appspot.com/13008028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/proxy_resolving_client_socket.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc index 8bc423b..ce922f3 100644 --- a/jingle/glue/proxy_resolving_client_socket.cc +++ b/jingle/glue/proxy_resolving_client_socket.cc @@ -192,7 +192,8 @@ void ProxyResolvingClientSocket::ProcessProxyResolveDone(int status) { // Now that we have resolved the proxy, we need to connect. status = net::InitSocketHandleForRawConnect( dest_host_port_pair_, network_session_.get(), proxy_info_, ssl_config_, - ssl_config_, bound_net_log_, transport_.get(), connect_callback_); + ssl_config_, net::kPrivacyModeDisabled, bound_net_log_, transport_.get(), + connect_callback_); if (status != net::ERR_IO_PENDING) { // Since this method is always called asynchronously. it is OK to call // ProcessConnectDone synchronously. |