Adding socks4 support for chromium. tested for windows and linux....

net/proxy/proxy_server_unittest.cc

 // Copyright (c) 2009 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 107 matching lines @@
     },
     {
        "socks5://foopy:10",
        "socks5://foopy:10",
        net::ProxyServer::SCHEME_SOCKS5,
        "foopy",
        10,
        "foopy:10",
        "SOCKS5 foopy:10"
     },
+
+    // SOCKS proxy URIs (should default to SOCKS4)
+    {
+       "socks://foopy",  // No port.
+       "socks4://foopy:1080",
+       net::ProxyServer::SCHEME_SOCKS4,
+       "foopy",
+       1080,
+       "foopy:1080",
+       "SOCKS foopy:1080"
+    },
+    {
+       "socks://foopy:10",
+       "socks4://foopy:10",
+       net::ProxyServer::SCHEME_SOCKS4,
+       "foopy",
+       10,
+       "foopy:10",
+       "SOCKS foopy:10"
+    },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     net::ProxyServer uri = net::ProxyServer::FromURI(tests[i].input_uri);
     EXPECT_TRUE(uri.is_valid());
     EXPECT_FALSE(uri.is_direct());
     EXPECT_EQ(tests[i].expected_uri, uri.ToURI());
     EXPECT_EQ(tests[i].expected_scheme, uri.scheme());
     EXPECT_EQ(tests[i].expected_host, uri.HostNoBrackets());
     EXPECT_EQ(tests[i].expected_port, uri.port());
@@ skipping 17 matching lines @@
   EXPECT_EQ("DIRECT", uri.ToPacString());
 }
 
 // Test parsing some invalid inputs.
 TEST(ProxyServerTest, Invalid) {
   const char* tests[] = {
     "",
     "   ",
     "dddf:",   // not a valid port
     "dddd:d",  // not a valid port
-    "socks://foopy",  // not a valid scheme (needs to be socks4 or sock5).
     "http://",  // not a valid host/port.
     "direct://xyz",  // direct is not allowed a host/port.
     "http:/",  // ambiguous, but will fail because of bad port.
     "http:",  // ambiguous, but will fail because of bad port.
     "https://blah",  // "https" is not a valid proxy scheme.
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     net::ProxyServer uri = net::ProxyServer::FromURI(tests[i]);
     EXPECT_FALSE(uri.is_valid());
@@ skipping 74 matching lines @@
     "PROXY",  // missing host/port.
     "SOCKS",  // missing host/port.
     "DIRECT foopy:10",  // direct cannot have host/port.
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     net::ProxyServer uri = net::ProxyServer::FromPacString(tests[i]);
     EXPECT_FALSE(uri.is_valid());
   }
 }