summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_transaction_unittest.cc
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-28 22:12:48 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-28 22:12:48 +0000
commit23f7bf8dce02ad0bc36936a3390fbb356af57629 (patch)
treed6c001d35e8ac06014fff882f360ef44f2d30398 /net/http/http_network_transaction_unittest.cc
parent3c6f8817e537280eb59fe0a73c14ce3a46cdc7ef (diff)
downloadchromium_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_network_transaction_unittest.cc')
-rw-r--r--net/http/http_network_transaction_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 02a77e4..ca06785 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -9218,7 +9218,7 @@ TEST_P(HttpNetworkTransactionTest,
// Set up an initial SpdySession in the pool to reuse.
HostPortPair host_port_pair("www.google.com", 443);
SpdySessionKey key(host_port_pair, ProxyServer::Direct(),
- PRIVACY_MODE_DISABLED);
+ kPrivacyModeDisabled);
base::WeakPtr<SpdySession> spdy_session =
CreateSecureSpdySession(session, key, BoundNetLog());
@@ -10377,7 +10377,7 @@ TEST_P(HttpNetworkTransactionTest, PreconnectWithExistingSpdySession) {
// Set up an initial SpdySession in the pool to reuse.
HostPortPair host_port_pair("www.google.com", 443);
SpdySessionKey key(host_port_pair, ProxyServer::Direct(),
- PRIVACY_MODE_DISABLED);
+ kPrivacyModeDisabled);
base::WeakPtr<SpdySession> spdy_session =
CreateInsecureSpdySession(session, key, BoundNetLog());
@@ -11735,7 +11735,7 @@ TEST_P(HttpNetworkTransactionTest, CloseIdleSpdySessionToOpenNewOne) {
HostPortPair host_port_pair_a("www.a.com", 443);
SpdySessionKey spdy_session_key_a(
- host_port_pair_a, ProxyServer::Direct(), PRIVACY_MODE_DISABLED);
+ host_port_pair_a, ProxyServer::Direct(), kPrivacyModeDisabled);
EXPECT_FALSE(
HasSpdySession(session->spdy_session_pool(), spdy_session_key_a));
@@ -11767,7 +11767,7 @@ TEST_P(HttpNetworkTransactionTest, CloseIdleSpdySessionToOpenNewOne) {
HostPortPair host_port_pair_b("www.b.com", 443);
SpdySessionKey spdy_session_key_b(
- host_port_pair_b, ProxyServer::Direct(), PRIVACY_MODE_DISABLED);
+ host_port_pair_b, ProxyServer::Direct(), kPrivacyModeDisabled);
EXPECT_FALSE(
HasSpdySession(session->spdy_session_pool(), spdy_session_key_b));
HttpRequestInfo request2;
@@ -11795,7 +11795,7 @@ TEST_P(HttpNetworkTransactionTest, CloseIdleSpdySessionToOpenNewOne) {
HostPortPair host_port_pair_a1("www.a.com", 80);
SpdySessionKey spdy_session_key_a1(
- host_port_pair_a1, ProxyServer::Direct(), PRIVACY_MODE_DISABLED);
+ host_port_pair_a1, ProxyServer::Direct(), kPrivacyModeDisabled);
EXPECT_FALSE(
HasSpdySession(session->spdy_session_pool(), spdy_session_key_a1));
HttpRequestInfo request3;