Change the meaning of the command-line flag --proxy-server="socks://foo" to i...

net/proxy/proxy_server_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "net/proxy/proxy_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Test the creation of ProxyServer using ProxyServer::FromURI, which parses
 // inputs of the form [<scheme>"://"]<host>[":"<port>]. Verify that each part
@@ skipping 96 matching lines @@
     },
     {
        "socks5://foopy:10",
        "socks5://foopy:10",
        net::ProxyServer::SCHEME_SOCKS5,
        "foopy",
        10,
        "SOCKS5 foopy:10"
     },
 
-    // SOCKS proxy URIs (should default to SOCKS4)
+    // SOCKS proxy URIs (should default to SOCKS5)
     {
        "socks://foopy",  // No port.
-       "socks4://foopy:1080",
-       net::ProxyServer::SCHEME_SOCKS4,
+       "socks5://foopy:1080",
+       net::ProxyServer::SCHEME_SOCKS5,
        "foopy",
        1080,
-       "SOCKS foopy:1080"
+       "SOCKS5 foopy:1080"
     },
     {
        "socks://foopy:10",
-       "socks4://foopy:10",
-       net::ProxyServer::SCHEME_SOCKS4,
+       "socks5://foopy:10",
+       net::ProxyServer::SCHEME_SOCKS5,
        "foopy",
        10,
-       "SOCKS foopy:10"
+       "SOCKS5 foopy:10"
     },
 
     // HTTPS proxy URIs:
     {
        "https://foopy",     // No port
        "https://foopy:443",
        net::ProxyServer::SCHEME_HTTPS,
        "foopy",
        443,
        "HTTPS foopy:443"
@@ skipping 216 matching lines @@
       case 1:
         EXPECT_FALSE(server1 < server2);
         EXPECT_TRUE(server2 < server1);
         EXPECT_FALSE(server2 == server1);
         break;
       default:
         FAIL() << "Invalid expectation. Can be only -1, 0, 1";
     }
   }
 }