Add data reduction functionality to all platforms.

net/proxy/proxy_list.cc

 // Copyright (c) 2012 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_list.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
-#include "base/rand_util.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "net/proxy/proxy_server.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 namespace net {
 
@@ skipping 140 matching lines @@
   //
   // And also, before failing the transaction wholesale, we could go back and
   // retry the "bad proxies" which we never tried to begin with.
   // (RemoveBadProxies would annotate them as 'expected bad' rather then delete
   // them from the list, so we would know what they were).
 
   if (proxies_.empty()) {
     NOTREACHED();
     return false;
   }
-  UpdateRetryInfoOnFallback(proxy_retry_info, base::TimeDelta(), true,
+  // By default, proxies are not retried for 5 minutes.
+  UpdateRetryInfoOnFallback(proxy_retry_info, TimeDelta::FromMinutes(5), true,
                             ProxyServer(), net_log);

[Ryan Sleevi, 2014/07/22 08:22:25]

This needs to be separated and dealt with first, independently.

[Not at Google. Contact bengr, 2014/07/22 23:03:53]

I am isolating this to a separate cl. Will send it to you for review.

 
   // Remove this proxy from our list.
   proxies_.erase(proxies_.begin());
   return !proxies_.empty();
 }
 
 void ProxyList::AddProxyToRetryList(ProxyRetryInfoMap* proxy_retry_info,
                                     base::TimeDelta retry_delay,
                                     bool try_while_bad,
                                     const ProxyServer& proxy_to_retry,
@@ skipping 15 matching lines @@
   net_log.AddEvent(NetLog::TYPE_PROXY_LIST_FALLBACK,
                    NetLog::StringCallback("bad_proxy", &proxy_key));
 }
 
 void ProxyList::UpdateRetryInfoOnFallback(
     ProxyRetryInfoMap* proxy_retry_info,
     base::TimeDelta retry_delay,
     bool reconsider,
     const ProxyServer& another_proxy_to_bypass,
     const BoundNetLog& net_log) const {
-  // Time to wait before retrying a bad proxy server.
-  if (retry_delay == base::TimeDelta()) {
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
-    // Randomize the timeout over a range from one to five minutes.
-    retry_delay =
-        TimeDelta::FromMilliseconds(
-            base::RandInt(1 * 60 * 1000, 5 * 60 * 1000));
-#else
-    retry_delay = TimeDelta::FromMinutes(5);
-#endif
-  }
-
+  DCHECK(retry_delay != base::TimeDelta());

[Ryan Sleevi, 2014/07/22 01:56:31]

No documentation/comment that I can tell why you're removing this.

[Not at Google. Contact bengr, 2014/07/22 23:03:53]

We randomize the duration for data reduction proxy, and always use exactly 5
minutes for other proxies. Will awlays be passed into this method, so will no
longer be an issue.

   if (proxies_.empty()) {
     NOTREACHED();
     return;
   }
 
   if (!proxies_[0].is_direct()) {
     AddProxyToRetryList(proxy_retry_info, retry_delay, reconsider, proxies_[0],
                         net_log);
 
     // If an additional proxy to bypass is specified, add it to the retry map
     // as well.
     if (another_proxy_to_bypass.is_valid()) {
       AddProxyToRetryList(proxy_retry_info, retry_delay, reconsider,
                           another_proxy_to_bypass, net_log);
     }
   }
 }
 
 }  // namespace net