Fixed DataReductionProxyParams::AreProxiesBypassed logic

components/data_reduction_proxy/browser/data_reduction_proxy_params.cc

 // Copyright 2014 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 "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 382 matching lines @@
   return false;
 }
 
 bool DataReductionProxyParams::AreProxiesBypassed(
     const net::ProxyRetryInfoMap& retry_map,
     bool is_https,
     base::TimeDelta* min_retry_delay) const {
   if (retry_map.size() == 0)
     return false;
 
-  if (is_https && alt_allowed_) {
-    return ArePrimaryAndFallbackBypassed(
-        retry_map, ssl_origin_, GURL(), min_retry_delay);
+  // If the request is https, consider only the ssl proxy.
+  if (is_https) {
+    if (alt_allowed_) {
+      return ArePrimaryAndFallbackBypassed(
+          retry_map, ssl_origin_, GURL(), min_retry_delay);
+    } else {
+      NOTREACHED();
+      return false;
+    }
   }
 
   if (allowed_ && ArePrimaryAndFallbackBypassed(
       retry_map, origin_, fallback_origin_, min_retry_delay)) {
     return true;
   }
 
   if (alt_allowed_ && ArePrimaryAndFallbackBypassed(
       retry_map, alt_origin_, alt_fallback_origin_, min_retry_delay)) {
     return true;
   }
 
   return false;
 }
 
 bool DataReductionProxyParams::ArePrimaryAndFallbackBypassed(
     const net::ProxyRetryInfoMap& retry_map,
     const GURL& primary,
     const GURL& fallback,
     base::TimeDelta* min_retry_delay) const {
+  // Look for the primary proxy in the retry map. This must be done before
+  // looking for the fallback in order to assign |min_retry_delay| if the
+  // primary proxy has a shorter delay.
+  base::TimeDelta delay;
   net::ProxyRetryInfoMap::const_iterator found = retry_map.find(
       net::ProxyServer(primary.SchemeIs(url::kHttpsScheme) ?
-          net::ProxyServer::SCHEME_HTTPS : net::ProxyServer::SCHEME_HTTP,
-          net::HostPortPair::FromURL(primary)).ToURI());
+                           net::ProxyServer::SCHEME_HTTPS :
+                           net::ProxyServer::SCHEME_HTTP,
+                       net::HostPortPair::FromURL(primary)).ToURI());
+  if (found != retry_map.end()) {

[bengr, 2014/08/15 06:16:06]

You don't have to do this work if !fallback_allowed_, do you?

[bengr, 2014/08/15 17:58:56]

I see. This is needed.

+    delay = found->second.current_delay;
+  }
+
+  if (fallback_allowed_ && fallback.is_valid()) {
+    // If fallback is allowed, only the fallback proxy needs to be on the retry
+    // map to know if there was a bypass. We can reset found and forget if the
+    // primary was on the retry map.
+    found = retry_map.find(
+        net::ProxyServer(fallback.SchemeIs(url::kHttpsScheme) ?
+                             net::ProxyServer::SCHEME_HTTPS :
+                             net::ProxyServer::SCHEME_HTTP,
+                         net::HostPortPair::FromURL(fallback)).ToURI());
+    if (found != retry_map.end() &&
+        delay > found->second.current_delay) {
+      delay = found->second.current_delay;

[bengr, 2014/08/15 06:16:05]

Does this work? If the primary proxy is not found then delay is 0 when we get
here, which is not greater than found->second.current_delay, so delay won't be
set.

[megjablon, 2014/08/15 19:04:23]

Added in setting delay to max to fix.

+    }
+  }
+
+  if (min_retry_delay != NULL) {
+    *min_retry_delay = delay;
+  }
 
   if (found == retry_map.end())
     return false;
-
-  base::TimeDelta min_delay = found->second.current_delay;
-  if (!fallback_allowed_ || !fallback.is_valid()) {
-    if (min_retry_delay != NULL)
-      *min_retry_delay = min_delay;
-    return true;
-  }
-
-  found = retry_map.find(
-      net::ProxyServer(fallback.SchemeIs(url::kHttpsScheme) ?
-          net::ProxyServer::SCHEME_HTTPS : net::ProxyServer::SCHEME_HTTP,
-          net::HostPortPair::FromURL(fallback)).ToURI());
-
-  if (found == retry_map.end())
-    return false;
-
-  if (min_delay > found->second.current_delay)
-    min_delay = found->second.current_delay;
-  if (min_retry_delay != NULL)
-    *min_retry_delay = min_delay;
   return true;
 }
 
 std::string DataReductionProxyParams::GetDefaultOrigin() const {
 #if defined(SPDY_PROXY_AUTH_ORIGIN)
   return SPDY_PROXY_AUTH_ORIGIN;
 #endif
   return std::string();
 }
 
@@ skipping 33 matching lines @@
 }
 
 std::string DataReductionProxyParams::GetDefaultWarmupURL() const {
 #if defined(DATA_REDUCTION_PROXY_WARMUP_URL)
   return DATA_REDUCTION_PROXY_WARMUP_URL;
 #endif
   return std::string();
 }
 
 }  // namespace data_reduction_proxy