Migrate Proxy Settings API to net::ProxyServer

net/proxy/proxy_server.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 "net/proxy/proxy_server.h"
 
 #include <algorithm>
 
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "net/base/net_util.h"
 #include "net/http/http_util.h"
 
 namespace net {
 
 namespace {
 
 // Parse the proxy type from a PAC string, to a ProxyServer::Scheme.
 // This mapping is case-insensitive. If no type could be matched
 // returns SCHEME_INVALID.
-ProxyServer::Scheme GetSchemeFromPacType(std::string::const_iterator begin,
-                                         std::string::const_iterator end) {
+ProxyServer::Scheme GetSchemeFromPacTypeInternal(
+    std::string::const_iterator begin,
+    std::string::const_iterator end) {
   if (LowerCaseEqualsASCII(begin, end, "proxy"))
     return ProxyServer::SCHEME_HTTP;
   if (LowerCaseEqualsASCII(begin, end, "socks")) {
     // Default to v4 for compatibility. This is because the SOCKS4 vs SOCKS5
     // notation didn't originally exist, so if a client returns SOCKS they
     // really meant SOCKS4.
     return ProxyServer::SCHEME_SOCKS4;
   }
   if (LowerCaseEqualsASCII(begin, end, "socks4"))
     return ProxyServer::SCHEME_SOCKS4;
   if (LowerCaseEqualsASCII(begin, end, "socks5"))
     return ProxyServer::SCHEME_SOCKS5;
   if (LowerCaseEqualsASCII(begin, end, "direct"))
     return ProxyServer::SCHEME_DIRECT;
   if (LowerCaseEqualsASCII(begin, end, "https"))
     return ProxyServer::SCHEME_HTTPS;
 
   return ProxyServer::SCHEME_INVALID;
 }
 
 // Parse the proxy scheme from a URL-like representation, to a
 // ProxyServer::Scheme.  This corresponds with the values used in
 // ProxyServer::ToURI(). If no type could be matched, returns SCHEME_INVALID.
-ProxyServer::Scheme GetSchemeFromURI(std::string::const_iterator begin,
-                                     std::string::const_iterator end) {
+ProxyServer::Scheme GetSchemeFromURIInternal(std::string::const_iterator begin,
+                                             std::string::const_iterator end) {
   if (LowerCaseEqualsASCII(begin, end, "http"))
     return ProxyServer::SCHEME_HTTP;
   if (LowerCaseEqualsASCII(begin, end, "socks4"))
     return ProxyServer::SCHEME_SOCKS4;
   if (LowerCaseEqualsASCII(begin, end, "socks"))
     return ProxyServer::SCHEME_SOCKS5;
   if (LowerCaseEqualsASCII(begin, end, "socks5"))
     return ProxyServer::SCHEME_SOCKS5;
   if (LowerCaseEqualsASCII(begin, end, "direct"))
     return ProxyServer::SCHEME_DIRECT;
@@ skipping 45 matching lines @@
 
   // Trim the leading/trailing whitespace.
   HttpUtil::TrimLWS(&begin, &end);
 
   // Check for [<scheme> "://"]
   std::string::const_iterator colon = std::find(begin, end, ':');
   if (colon != end &&
       (end - colon) >= 3 &&
       *(colon + 1) == '/' &&
       *(colon + 2) == '/') {
-    scheme = GetSchemeFromURI(begin, colon);
+    scheme = GetSchemeFromURIInternal(begin, colon);
     begin = colon + 3;  // Skip past the "://"
   }
 
   // Now parse the <host>[":"<port>].
   return FromSchemeHostAndPort(scheme, begin, end);
 }
 
 std::string ProxyServer::ToURI() const {
   switch (scheme_) {
     case SCHEME_DIRECT:
@@ skipping 30 matching lines @@
 
   // Start by finding the first space (if any).
   std::string::const_iterator space;
   for (space = begin; space != end; ++space) {
     if (HttpUtil::IsLWS(*space)) {
       break;
     }
   }
 
   // Everything to the left of the space is the scheme.
-  Scheme scheme = GetSchemeFromPacType(begin, space);
+  Scheme scheme = GetSchemeFromPacTypeInternal(begin, space);
 
   // And everything to the right of the space is the
   // <host>[":" <port>].
   return FromSchemeHostAndPort(scheme, space, end);
 }
 
 std::string ProxyServer::ToPacString() const {
     switch (scheme_) {
     case SCHEME_DIRECT:
       return "DIRECT";
@@ skipping 22 matching lines @@
     case SCHEME_SOCKS5:
       return 1080;
     case SCHEME_HTTPS:
       return 443;
     default:
       return -1;
   }
 }
 
 // static
+ProxyServer::Scheme ProxyServer::GetSchemeFromURI(const std::string& scheme) {
+  return GetSchemeFromURIInternal(scheme.begin(), scheme.end());
+}
+
+// static
 ProxyServer ProxyServer::FromSchemeHostAndPort(
     Scheme scheme,
     std::string::const_iterator begin,
     std::string::const_iterator end) {
 
   // Trim leading/trailing space.
   HttpUtil::TrimLWS(&begin, &end);
 
   if (scheme == SCHEME_DIRECT && begin != end)
     return ProxyServer();  // Invalid -- DIRECT cannot have a host/port.
@@ skipping 12 matching lines @@
     if (port == -1)
       port = GetDefaultPortForScheme(scheme);
 
     host_port_pair = HostPortPair(HostNoBrackets(host), port);
   }
 
   return ProxyServer(scheme, host_port_pair);
 }
 
 }  // namespace net