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

net/proxy/proxy_server.h

Index: net/proxy/proxy_server.h
===================================================================
--- net/proxy/proxy_server.h	(revision 37149)
+++ net/proxy/proxy_server.h	(working copy)
@@ -101,6 +101,11 @@
   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;