Remove //net (except for Android test stuff) and sdch

net/proxy/proxy_server.cc

Index: net/proxy/proxy_server.cc
diff --git a/net/proxy/proxy_server.cc b/net/proxy/proxy_server.cc
deleted file mode 100644
index 78d5c3e3491d39b70d76e7e1f6e110cc00ea90a7..0000000000000000000000000000000000000000
--- a/net/proxy/proxy_server.cc
+++ /dev/null
@@ -1,248 +0,0 @@
-// 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/basictypes.h"
-#include "base/strings/string_util.h"
-#include "net/base/net_util.h"
-#include "net/http/http_util.h"
-
-namespace net {
-
-namespace {
-
-// Parses 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 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;
-  if (LowerCaseEqualsASCII(begin, end, "quic"))
-    return ProxyServer::SCHEME_QUIC;
-
-  return ProxyServer::SCHEME_INVALID;
-}
-
-// Parses 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 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;
-  if (LowerCaseEqualsASCII(begin, end, "https"))
-    return ProxyServer::SCHEME_HTTPS;
-  if (LowerCaseEqualsASCII(begin, end, "quic"))
-    return ProxyServer::SCHEME_QUIC;
-  return ProxyServer::SCHEME_INVALID;
-}
-
-}  // namespace
-
-ProxyServer::ProxyServer(Scheme scheme, const HostPortPair& host_port_pair)
-      : scheme_(scheme), host_port_pair_(host_port_pair) {
-  if (scheme_ == SCHEME_DIRECT || scheme_ == SCHEME_INVALID) {
-    // |host_port_pair| isn't relevant for these special schemes, so none should
-    // have been specified. It is important for this to be consistent since we
-    // do raw field comparisons in the equality and comparison functions.
-    DCHECK(host_port_pair.Equals(HostPortPair()));
-    host_port_pair_ = HostPortPair();
-  }
-}
-
-const HostPortPair& ProxyServer::host_port_pair() const {
-  // Doesn't make sense to call this if the URI scheme doesn't
-  // have concept of a host.
-  DCHECK(is_valid());
-  DCHECK(!is_direct());
-  return host_port_pair_;
-}
-
-// static
-ProxyServer ProxyServer::FromURI(const std::string& uri,
-                                 Scheme default_scheme) {
-  return FromURI(uri.begin(), uri.end(), default_scheme);
-}
-
-// static
-ProxyServer ProxyServer::FromURI(std::string::const_iterator begin,
-                                 std::string::const_iterator end,
-                                 Scheme default_scheme) {
-  // We will default to |default_scheme| if no scheme specifier was given.
-  Scheme scheme = default_scheme;
-
-  // 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 = 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:
-      return "direct://";
-    case SCHEME_HTTP:
-      // Leave off "http://" since it is our default scheme.
-      return host_port_pair().ToString();
-    case SCHEME_SOCKS4:
-      return std::string("socks4://") + host_port_pair().ToString();
-    case SCHEME_SOCKS5:
-      return std::string("socks5://") + host_port_pair().ToString();
-    case SCHEME_HTTPS:
-      return std::string("https://") + host_port_pair().ToString();
-    case SCHEME_QUIC:
-      return std::string("quic://") + host_port_pair().ToString();
-    default:
-      // Got called with an invalid scheme.
-      NOTREACHED();
-      return std::string();
-  }
-}
-
-// static
-ProxyServer ProxyServer::FromPacString(const std::string& pac_string) {
-  return FromPacString(pac_string.begin(), pac_string.end());
-}
-
-// static
-ProxyServer ProxyServer::FromPacString(std::string::const_iterator begin,
-                                       std::string::const_iterator end) {
-  // Trim the leading/trailing whitespace.
-  HttpUtil::TrimLWS(&begin, &end);
-
-  // Input should match:
-  // "DIRECT" | ( <type> 1*(LWS) <host-and-port> )
-
-  // 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 = 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";
-    case SCHEME_HTTP:
-      return std::string("PROXY ") + host_port_pair().ToString();
-    case SCHEME_SOCKS4:
-      // For compatibility send SOCKS instead of SOCKS4.
-      return std::string("SOCKS ") + host_port_pair().ToString();
-    case SCHEME_SOCKS5:
-      return std::string("SOCKS5 ") + host_port_pair().ToString();
-    case SCHEME_HTTPS:
-      return std::string("HTTPS ") + host_port_pair().ToString();
-    case SCHEME_QUIC:
-      return std::string("QUIC ") + host_port_pair().ToString();
-    default:
-      // Got called with an invalid scheme.
-      NOTREACHED();
-      return std::string();
-  }
-}
-
-// static
-int ProxyServer::GetDefaultPortForScheme(Scheme scheme) {
-  switch (scheme) {
-    case SCHEME_HTTP:
-      return 80;
-    case SCHEME_SOCKS4:
-    case SCHEME_SOCKS5:
-      return 1080;
-    case SCHEME_HTTPS:
-    case SCHEME_QUIC:
-      return 443;
-    case SCHEME_INVALID:
-    case SCHEME_DIRECT:
-      break;
-  }
-  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.
-
-  HostPortPair host_port_pair;
-
-  if (scheme != SCHEME_INVALID && scheme != SCHEME_DIRECT) {
-    std::string host;
-    int port = -1;
-    // If the scheme has a host/port, parse it.
-    bool ok = net::ParseHostAndPort(begin, end, &host, &port);
-    if (!ok)
-      return ProxyServer();  // Invalid -- failed parsing <host>[":"<port>]
-
-    // Choose a default port number if none was given.
-    if (port == -1)
-      port = GetDefaultPortForScheme(scheme);
-
-    host_port_pair = HostPortPair(host, static_cast<uint16>(port));
-  }
-
-  return ProxyServer(scheme, host_port_pair);
-}
-
-}  // namespace net