Merge 34903, 34928, 35008, 35549, 36054 to the 249s branch....

net/proxy/proxy_server.h

 // 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.
 
 #ifndef NET_PROXY_PROXY_SERVER_H_
 #define NET_PROXY_PROXY_SERVER_H_
 
 #include <string>
 
 namespace net {
@@ skipping 83 matching lines @@
   //
   // Examples:
   //   "PROXY foopy:19"   {scheme=HTTP, host="foopy", port=19}
   //   "DIRECT"           {scheme=DIRECT}
   //   "SOCKS5 foopy"     {scheme=SOCKS5, host="foopy", port=1080}
   //   "BLAH xxx:xx"      INVALID
   static ProxyServer FromPacString(const std::string& pac_string);
   static ProxyServer FromPacString(std::string::const_iterator pac_string_begin,
                                    std::string::const_iterator pac_string_end);
 
+  // Returns a ProxyServer representing DIRECT connections.
+  static ProxyServer Direct() {
+    return ProxyServer(SCHEME_DIRECT, std::string(), -1);
+  }
+
   // Format 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);
 
   bool operator==(const ProxyServer& other) const {
     return scheme_ == other.scheme_ &&
            host_ == other.host_ &&
            port_ == other.port_;
   }
 
  private:
   // Create 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_;
   std::string host_;
   int port_;
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_SERVER_H_