Migrate Proxy Settings API to net::ProxyServer

net/proxy/proxy_server.h

 // 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.
 
 #ifndef NET_PROXY_PROXY_SERVER_H_
 #define NET_PROXY_PROXY_SERVER_H_
 #pragma once
 
 #include "build/build_config.h"
 
@@ skipping 110 matching lines @@
                                     CFStringRef port_key);
 #endif
 
   // Formats as a PAC result entry. This does the reverse of FromPacString().
   std::string ToPacString() const;
 
   // Returns the default port number for a proxy server with the specified
   // scheme. Returns -1 if unknown.
   static int GetDefaultPortForScheme(Scheme scheme);
 
+  // Parse the proxy scheme from a URL-like representation, to a

[eroman, 2011/02/09 05:12:46]

nit: please use passive tense, as in "Parses"

[battre, 2011/02/09 10:04:38]

Done.

+  // ProxyServer::Scheme.  This corresponds with the values used in
+  // ProxyServer::ToURI(). If no type could be matched, returns SCHEME_INVALID.
+  // |scheme| can be one from http, https, socks, socks4, socks5, direct.

[eroman, 2011/02/09 05:12:46]

nit: "from" ---> "of"

[battre, 2011/02/09 10:04:38]

Done.

+  static Scheme GetSchemeFromURI(const std::string& scheme);
+
   bool operator==(const ProxyServer& other) const {
     return scheme_ == other.scheme_ &&
            host_port_pair_.Equals(other.host_port_pair_);
   }
 
   // Comparator function so this can be placed in a std::map.
   bool operator<(const ProxyServer& other) const {
     if (scheme_ != other.scheme_)
       return scheme_ < other.scheme_;
     return host_port_pair_ < other.host_port_pair_;
   }
 
  private:
   // Creates a ProxyServer given a scheme, and host/port string. If parsing the
   // host/port string fails, the returned instance will be invalid.
   static ProxyServer FromSchemeHostAndPort(
       Scheme scheme,
       std::string::const_iterator host_and_port_begin,
       std::string::const_iterator host_and_port_end);
 
   Scheme scheme_;
   HostPortPair host_port_pair_;
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_SERVER_H_