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/websockets | |
| 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/websockets')
| -rw-r--r-- | net/websockets/websocket_job.cc | 2 | ||||
| -rw-r--r-- | net/websockets/websocket_job_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc index 9ee38b7..63e65a4 100644 --- a/net/websockets/websocket_job.cc +++ b/net/websockets/websocket_job.cc @@ -388,7 +388,7 @@ void WebSocketJob::AddCookieHeaderAndSend() { void WebSocketJob::LoadCookieCallback(const std::string& cookie) { if (!cookie.empty()) // TODO(tyoshino): Sending cookie means that connection doesn't need - // PRIVACY_MODE_ENABLED as cookies may be server-bound and channel id + // kPrivacyModeEnabled as cookies may be server-bound and channel id // wouldn't negatively affect privacy anyway. Need to restart connection // or refactor to determine cookie status prior to connecting. handshake_request_->AppendHeaderIfMissing("Cookie", cookie); diff --git a/net/websockets/websocket_job_test.cc b/net/websockets/websocket_job_test.cc index 1363ff7..e12ddae 100644 --- a/net/websockets/websocket_job_test.cc +++ b/net/websockets/websocket_job_test.cc @@ -286,7 +286,7 @@ class MockHttpTransactionFactory : public HttpTransactionFactory { host_port_pair_.set_port(80); spdy_session_key_ = SpdySessionKey(host_port_pair_, ProxyServer::Direct(), - PRIVACY_MODE_DISABLED); + kPrivacyModeDisabled); session_ = CreateInsecureSpdySession( http_session_, spdy_session_key_, BoundNetLog()); } |