diff options
author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 22:12:48 +0000 |
---|---|---|
committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 22:12:48 +0000 |
commit | 23f7bf8dce02ad0bc36936a3390fbb356af57629 (patch) | |
tree | d6c001d35e8ac06014fff882f360ef44f2d30398 /net/http/http_stream_factory_impl_job.cc | |
parent | 3c6f8817e537280eb59fe0a73c14ce3a46cdc7ef (diff) | |
download | chromium_src-23f7bf8dce02ad0bc36936a3390fbb356af57629.zip chromium_src-23f7bf8dce02ad0bc36936a3390fbb356af57629.tar.gz chromium_src-23f7bf8dce02ad0bc36936a3390fbb356af57629.tar.bz2 |
Revert of Rename PrivateMode enum values: (https://codereview.chromium.org/215023002/)
Reason for revert:
Broke build.
http://build.chromium.org/p/chromium.linux/builders/Linux%20Builder%20%28dbg%29/builds/71042/steps/compile/logs/stdio#error1
Original issue's description:
> Rename PrivateMode enum values:
>
> kPrivacyModeDisabled => PRIVACY_MODE_DISABLED
> kPrivacyModeEnabled => PRIVACY_MODE_ENABLED
>
> To match the chromium style guide:
>
> Though the Google C++ Style Guide now says to use kConstantNaming for enums,
> Chromium was written using MACRO_STYLE naming. Continue to use this style for consistency.
>
> R=mef@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=260281
TBR=mef@chromium.org,zea@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/217053010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260296 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_stream_factory_impl_job.cc')
-rw-r--r-- | net/http/http_stream_factory_impl_job.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc index b23ec2a..09b58d4 100644 --- a/net/http/http_stream_factory_impl_job.cc +++ b/net/http/http_stream_factory_impl_job.cc @@ -1092,7 +1092,7 @@ int HttpStreamFactoryImpl::Job::DoCreateStream() { // We never use privacy mode for connection to proxy server. spdy_session_key = SpdySessionKey(proxy_server.host_port_pair(), ProxyServer::Direct(), - PRIVACY_MODE_DISABLED); + kPrivacyModeDisabled); direct = false; } @@ -1278,7 +1278,7 @@ void HttpStreamFactoryImpl::Job::InitSSLConfig( ssl_config->verify_ev_cert = true; // Disable Channel ID if privacy mode is enabled. - if (request_info_.privacy_mode == PRIVACY_MODE_ENABLED) + if (request_info_.privacy_mode == kPrivacyModeEnabled) ssl_config->channel_id_enabled = false; } |