Index: net/http/http_log_util_unittest.cc |
diff --git a/net/http/http_log_util_unittest.cc b/net/http/http_log_util_unittest.cc |
index dd6af698787c9b1d77728c7d29b26eb37f6c94b9..bd9c79f0680d92bea60e602a6d087ae4a6a38b15 100644 |
--- a/net/http/http_log_util_unittest.cc |
+++ b/net/http/http_log_util_unittest.cc |
@@ -9,50 +9,63 @@ namespace net { |
TEST(HttpLogUtilTest, ElideHeaderValueForNetLog) { |
// Only elide for appropriate log level. |
- EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog( |
- NetLog::LOG_STRIP_PRIVATE_DATA, "Cookie", "name=value")); |
+ EXPECT_EQ("[10 bytes were stripped]", |
+ ElideHeaderValueForNetLog(NetLogCaptureMode::Default(), "Cookie", |
+ "name=value")); |
EXPECT_EQ("name=value", ElideHeaderValueForNetLog( |
- NetLog::LOG_ALL_BUT_BYTES, "Cookie", "name=value")); |
+ NetLogCaptureMode::IncludeCookiesAndCredentials(), |
+ "Cookie", "name=value")); |
// Headers are compared case insensitively. |
- EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog( |
- NetLog::LOG_STRIP_PRIVATE_DATA, "cOoKiE", "name=value")); |
+ EXPECT_EQ("[10 bytes were stripped]", |
+ ElideHeaderValueForNetLog(NetLogCaptureMode::Default(), "cOoKiE", |
+ "name=value")); |
// These headers should be completely elided. |
- EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog( |
- NetLog::LOG_STRIP_PRIVATE_DATA, "Set-Cookie", "name=value")); |
- EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog( |
- NetLog::LOG_STRIP_PRIVATE_DATA, "Set-Cookie2", "name=value")); |
- EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog( |
- NetLog::LOG_STRIP_PRIVATE_DATA, "Authorization", "Basic 1234")); |
- EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog( |
- NetLog::LOG_STRIP_PRIVATE_DATA, "Proxy-Authorization", "Basic 1234")); |
+ EXPECT_EQ("[10 bytes were stripped]", |
+ ElideHeaderValueForNetLog(NetLogCaptureMode::Default(), |
+ "Set-Cookie", "name=value")); |
+ EXPECT_EQ("[10 bytes were stripped]", |
+ ElideHeaderValueForNetLog(NetLogCaptureMode::Default(), |
+ "Set-Cookie2", "name=value")); |
+ EXPECT_EQ("[10 bytes were stripped]", |
+ ElideHeaderValueForNetLog(NetLogCaptureMode::Default(), |
+ "Authorization", "Basic 1234")); |
+ EXPECT_EQ("[10 bytes were stripped]", |
+ ElideHeaderValueForNetLog(NetLogCaptureMode::Default(), |
+ "Proxy-Authorization", "Basic 1234")); |
// Unknown headers should pass through. |
- EXPECT_EQ("value", ElideHeaderValueForNetLog( |
- NetLog::LOG_STRIP_PRIVATE_DATA, "Boring", "value")); |
+ EXPECT_EQ("value", ElideHeaderValueForNetLog(NetLogCaptureMode::Default(), |
+ "Boring", "value")); |
// Basic and Digest auth challenges are public. |
+ EXPECT_EQ("Basic realm=test", |
+ ElideHeaderValueForNetLog(NetLogCaptureMode::Default(), |
+ "WWW-Authenticate", "Basic realm=test")); |
+ EXPECT_EQ("Digest realm=test", |
+ ElideHeaderValueForNetLog(NetLogCaptureMode::Default(), |
+ "WWW-Authenticate", "Digest realm=test")); |
EXPECT_EQ("Basic realm=test", ElideHeaderValueForNetLog( |
- NetLog::LOG_STRIP_PRIVATE_DATA, "WWW-Authenticate", "Basic realm=test")); |
- EXPECT_EQ("Digest realm=test", ElideHeaderValueForNetLog( |
- NetLog::LOG_STRIP_PRIVATE_DATA, "WWW-Authenticate", "Digest realm=test")); |
- EXPECT_EQ("Basic realm=test", ElideHeaderValueForNetLog( |
- NetLog::LOG_STRIP_PRIVATE_DATA, |
- "Proxy-Authenticate", "Basic realm=test")); |
- EXPECT_EQ("Digest realm=test", ElideHeaderValueForNetLog( |
- NetLog::LOG_STRIP_PRIVATE_DATA, |
- "Proxy-Authenticate", "Digest realm=test")); |
+ NetLogCaptureMode::Default(), |
+ "Proxy-Authenticate", "Basic realm=test")); |
+ EXPECT_EQ( |
+ "Digest realm=test", |
+ ElideHeaderValueForNetLog(NetLogCaptureMode::Default(), |
+ "Proxy-Authenticate", "Digest realm=test")); |
// Multi-round mechanisms partially elided. |
- EXPECT_EQ("NTLM [4 bytes were stripped]", ElideHeaderValueForNetLog( |
- NetLog::LOG_STRIP_PRIVATE_DATA, "WWW-Authenticate", "NTLM 1234")); |
- EXPECT_EQ("NTLM [4 bytes were stripped]", ElideHeaderValueForNetLog( |
- NetLog::LOG_STRIP_PRIVATE_DATA, "Proxy-Authenticate", "NTLM 1234")); |
+ EXPECT_EQ("NTLM [4 bytes were stripped]", |
+ ElideHeaderValueForNetLog(NetLogCaptureMode::Default(), |
+ "WWW-Authenticate", "NTLM 1234")); |
+ EXPECT_EQ("NTLM [4 bytes were stripped]", |
+ ElideHeaderValueForNetLog(NetLogCaptureMode::Default(), |
+ "Proxy-Authenticate", "NTLM 1234")); |
// Leave whitespace intact. |
- EXPECT_EQ("NTLM [4 bytes were stripped] ", ElideHeaderValueForNetLog( |
- NetLog::LOG_STRIP_PRIVATE_DATA, "WWW-Authenticate", "NTLM 1234 ")); |
+ EXPECT_EQ("NTLM [4 bytes were stripped] ", |
+ ElideHeaderValueForNetLog(NetLogCaptureMode::Default(), |
+ "WWW-Authenticate", "NTLM 1234 ")); |
} |
} // namspace net |