Elide data reduction proxy credentials from NetLog

net/http/http_log_util_unittest.cc

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 1b0e9dbbfa255c403b181c760a47560532f4ee4e..3c5c82656fc4f563082b9a869cab5ba917294038 100644
--- a/net/http/http_log_util_unittest.cc
+++ b/net/http/http_log_util_unittest.cc
@@ -10,66 +10,64 @@ namespace net {
 TEST(HttpLogUtilTest, ElideHeaderValueForNetLog) {
   // Only elide for appropriate log level.
   EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA, "Cookie", "name=value"));
+      NetLog::LOG_STRIP_PRIVATE_DATA, "Cookie", "name=value"));
   EXPECT_EQ("name=value", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_ALL_BUT_BYTES, "Cookie", "name=value"));
+      NetLog::LOG_ALL_BUT_BYTES, "Cookie", "name=value"));
 
   // Headers are compared case insensitively.
   EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA, "cOoKiE", "name=value"));
+      NetLog::LOG_STRIP_PRIVATE_DATA, "cOoKiE", "name=value"));
 
   // These headers should be completely elided.
   EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA, "Set-Cookie", "name=value"));
+      NetLog::LOG_STRIP_PRIVATE_DATA, "Set-Cookie", "name=value"));
   EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA, "Set-Cookie2", "name=value"));
+      NetLog::LOG_STRIP_PRIVATE_DATA, "Set-Cookie2", "name=value"));
   EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA, "Authorization", "Basic 1234"));
-#if !defined(SPDY_PROXY_AUTH_ORIGIN)
+      NetLog::LOG_STRIP_PRIVATE_DATA, "Authorization", "Basic 1234"));
   EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA,
-      "Proxy-Authorization", "Basic 1234"));
-#endif
+      NetLog::LOG_STRIP_PRIVATE_DATA, "Proxy-Authorization", "Basic 1234"));
 
   // Unknown headers should pass through.
   EXPECT_EQ("value", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA, "Boring", "value"));
+      NetLog::LOG_STRIP_PRIVATE_DATA, "Boring", "value"));
 
   // Basic and Digest auth challenges are public.
   EXPECT_EQ("Basic realm=test", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA,
-      "WWW-Authenticate", "Basic realm=test"));
+      NetLog::LOG_STRIP_PRIVATE_DATA, "WWW-Authenticate", "Basic realm=test"));
   EXPECT_EQ("Digest realm=test", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA,
-      "WWW-Authenticate", "Digest realm=test"));
-#if !defined(SPDY_PROXY_AUTH_ORIGIN)
+      NetLog::LOG_STRIP_PRIVATE_DATA, "WWW-Authenticate", "Digest realm=test"));
   EXPECT_EQ("Basic realm=test", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA,
+      NetLog::LOG_STRIP_PRIVATE_DATA,
       "Proxy-Authenticate", "Basic realm=test"));
   EXPECT_EQ("Digest realm=test", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA,
+      NetLog::LOG_STRIP_PRIVATE_DATA,
       "Proxy-Authenticate", "Digest realm=test"));
-#endif
 
   // Multi-round mechanisms partially elided.
   EXPECT_EQ("NTLM [4 bytes were stripped]", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA, "WWW-Authenticate", "NTLM 1234"));
-#if !defined(SPDY_PROXY_AUTH_ORIGIN)
+      NetLog::LOG_STRIP_PRIVATE_DATA, "WWW-Authenticate", "NTLM 1234"));
   EXPECT_EQ("NTLM [4 bytes were stripped]", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA, "Proxy-Authenticate", "NTLM 1234"));
-#endif
+      NetLog::LOG_STRIP_PRIVATE_DATA, "Proxy-Authenticate", "NTLM 1234"));
 
   // Leave whitespace intact.
   EXPECT_EQ("NTLM  [4 bytes were stripped] ", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA, "WWW-Authenticate", "NTLM  1234 "));
+      NetLog::LOG_STRIP_PRIVATE_DATA, "WWW-Authenticate", "NTLM  1234 "));
 
   // Extra elisions for SPDY_PROXY_AUTH_ORIGIN.
 #if defined(SPDY_PROXY_AUTH_ORIGIN)
-  EXPECT_EQ("[elided]", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_ALL_BUT_BYTES,
-      "Proxy-Authenticate", "Basic realm=test"));
-  EXPECT_EQ("[elided]", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_ALL_BUT_BYTES, "Proxy-Authorization", "Basic 1234"));
+  EXPECT_EQ("ps=123, [7 bytes were stripped], c=foo, v=bar",
+            ElideHeaderValueForNetLog(
+                NetLog::LOG_STRIP_PRIVATE_DATA,
+                "Chrome-Proxy", "ps=123, sid=456, c=foo, v=bar"));
+  EXPECT_EQ("[7 bytes were stripped], ps=123, c=foo, v=bar",
+            ElideHeaderValueForNetLog(
+                NetLog::LOG_STRIP_PRIVATE_DATA,
+                "Chrome-Proxy", "sid=456, ps=123, c=foo, v=bar"));
+  EXPECT_EQ("ps=123, c=foo, v=bar, [7 bytes were stripped]",
+            ElideHeaderValueForNetLog(
+                NetLog::LOG_STRIP_PRIVATE_DATA,
+                "Chrome-Proxy", "ps=123, c=foo, v=bar, sid=456"));
 #endif
 }