| Index: net/proxy/proxy_config_service_linux_unittest.cc
|
| ===================================================================
|
| --- net/proxy/proxy_config_service_linux_unittest.cc (revision 60502)
|
| +++ net/proxy/proxy_config_service_linux_unittest.cc (working copy)
|
| @@ -581,7 +581,7 @@
|
| false, // auto_detect
|
| GURL(), // pac_url
|
| ProxyRulesExpectation::Single(
|
| - "socks4://socks.com:99", // single proxy
|
| + "socks5://socks.com:99", // single proxy
|
| "") // bypass rules
|
| },
|
|
|
| @@ -824,12 +824,12 @@
|
| false, // auto_detect
|
| GURL(), // pac_url
|
| ProxyRulesExpectation::Single(
|
| - "socks4://socks.com:888", // single proxy
|
| + "socks5://socks.com:888", // single proxy
|
| ""), // bypass rules
|
| },
|
|
|
| {
|
| - TEST_DESC("socks5"),
|
| + TEST_DESC("socks4"),
|
| { // Input.
|
| NULL, // DESKTOP_SESSION
|
| NULL, // HOME
|
| @@ -838,7 +838,7 @@
|
| NULL, // auto_proxy
|
| "", // all_proxy
|
| NULL, NULL, NULL, // per-proto proxies
|
| - "socks.com:888", "5", // SOCKS
|
| + "socks.com:888", "4", // SOCKS
|
| NULL, // no_proxy
|
| },
|
|
|
| @@ -846,7 +846,7 @@
|
| false, // auto_detect
|
| GURL(), // pac_url
|
| ProxyRulesExpectation::Single(
|
| - "socks5://socks.com:888", // single proxy
|
| + "socks4://socks.com:888", // single proxy
|
| ""), // bypass rules
|
| },
|
|
|
| @@ -868,7 +868,7 @@
|
| false, // auto_detect
|
| GURL(), // pac_url
|
| ProxyRulesExpectation::Single(
|
| - "socks4://socks.com:1080", // single proxy
|
| + "socks5://socks.com:1080", // single proxy
|
| ""), // bypass rules
|
| },
|
|
|
|
|