Add data reduction functionality to all platforms.

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/strings/string_util.h"
 #include "net/base/net_util.h"
@@ skipping 70 matching lines @@
     // 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() && !is_direct());
+  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
@@ skipping 110 matching lines @@
       break;
   }
   return -1;
 }
 
 // static
 ProxyServer::Scheme ProxyServer::GetSchemeFromURI(const std::string& scheme) {
   return GetSchemeFromURIInternal(scheme.begin(), scheme.end());
 }
 
-// TODO(bengr): Use |scheme_| to indicate that this is the data reduction proxy.
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
-bool ProxyServer::isDataReductionProxy() const {
-    bool dev_host = false;
-#if defined (DATA_REDUCTION_DEV_HOST)
-    dev_host = host_port_pair_.Equals(
-        HostPortPair::FromURL(GURL(DATA_REDUCTION_DEV_HOST)));
-#endif
-  return dev_host || host_port_pair_.Equals(
-      HostPortPair::FromURL(GURL(SPDY_PROXY_AUTH_ORIGIN)));
-}
-
-bool ProxyServer::isDataReductionProxyFallback() const {
-#if defined(DATA_REDUCTION_FALLBACK_HOST)
-  return host_port_pair_.Equals(
-      HostPortPair::FromURL(GURL(DATA_REDUCTION_FALLBACK_HOST)));
-#endif  // defined(DATA_REDUCTION_FALLBACK_HOST)
-  return false;
-}
-#endif  // defined(SPDY_PROXY_AUTH_ORIGIN)
-
 // 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)
@@ skipping 13 matching lines @@
     if (port == -1)
       port = GetDefaultPortForScheme(scheme);
 
     host_port_pair = HostPortPair(HostNoBrackets(host), port);
   }
 
   return ProxyServer(scheme, host_port_pair);
 }
 
 }  // namespace net