summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 01:28:53 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 01:28:53 +0000
commit314b03990f31330e847c384fbb9426ca5e6c1a58 (patch)
tree52eff81fb4eb0b127ef56ace4c8e3b155e8513ed /net/websockets
parent9decc62c6eb9f834323498611f8e112ff240aa14 (diff)
downloadchromium_src-314b03990f31330e847c384fbb9426ca5e6c1a58.zip
chromium_src-314b03990f31330e847c384fbb9426ca5e6c1a58.tar.gz
chromium_src-314b03990f31330e847c384fbb9426ca5e6c1a58.tar.bz2
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 Review URL: https://codereview.chromium.org/215023002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket_job.cc2
-rw-r--r--net/websockets/websocket_job_test.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc
index 63e65a4..9ee38b7 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
- // kPrivacyModeEnabled as cookies may be server-bound and channel id
+ // PRIVACY_MODE_ENABLED 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 e12ddae..1363ff7 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(),
- kPrivacyModeDisabled);
+ PRIVACY_MODE_DISABLED);
session_ = CreateInsecureSpdySession(
http_session_, spdy_session_key_, BoundNetLog());
}