Keep track of network error in ProxyRetryInfo.

net/base/network_delegate.h

Index: net/base/network_delegate.h
diff --git a/net/base/network_delegate.h b/net/base/network_delegate.h
index eafaca60bc4f3b5576c868321333aef759765f92..1ffd0be7f4c579b94d5daaf04664218631f79a91 100644
--- a/net/base/network_delegate.h
+++ b/net/base/network_delegate.h
@@ -64,9 +64,8 @@ class NET_EXPORT NetworkDelegate : public base::NonThreadSafe {
                              GURL* new_url);
   void NotifyResolveProxy(const GURL& url, int load_flags,
                           ProxyInfo* result);
-  void NotifyProxyFallback(const ProxyServer& bad_proxy,
-                           int net_error,
-                           bool did_fallback);
+  virtual void NotifyProxyFallback(const ProxyServer& bad_proxy,

[bengr, 2014/08/14 00:52:52]

This should not be virtual.

[Not at Google. Contact bengr, 2014/08/14 01:28:32]

Done

+                                   int net_error);
   int NotifyBeforeSendHeaders(URLRequest* request,
                               const CompletionCallback& callback,
                               HttpRequestHeaders* headers);
@@ -134,12 +133,10 @@ class NET_EXPORT NetworkDelegate : public base::NonThreadSafe {
                               int load_flags,
                               ProxyInfo* result);
 
-  // Called when use of |bad_proxy| fails due to |net_error|. |did_fallback| is
-  // true if the proxy service was able to fallback to another proxy
-  // configuration.
+  // Called when use of |bad_proxy| fails due to |net_error|. |net_error| is
+  // the network error encountered, if any.

[bengr, 2014/08/14 00:52:52]

Clarify that net_error == 0 indicates that the proxy fell back for a reason
other than a network error.

[Not at Google. Contact bengr, 2014/08/14 01:28:32]

Done.

   virtual void OnProxyFallback(const ProxyServer& bad_proxy,
-                               int net_error,
-                               bool did_fallback);
+                               int net_error);
 
   // Called right before the HTTP headers are sent. Allows the delegate to
   // read/write |headers| before they get sent out. |callback| and |headers| are