Keep track of network error in ProxyRetryInfo.

net/base/network_delegate.h

 // 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.
 
 #ifndef NET_BASE_NETWORK_DELEGATE_H_
 #define NET_BASE_NETWORK_DELEGATE_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 46 matching lines @@
 
   // Notification interface called by the network stack. Note that these
   // functions mostly forward to the private virtuals. They also add some sanity
   // checking on parameters. See the corresponding virtuals for explanations of
   // the methods and their arguments.
   int NotifyBeforeURLRequest(URLRequest* request,
                              const CompletionCallback& callback,
                              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);
   void NotifyBeforeSendProxyHeaders(URLRequest* request,
                                     const ProxyInfo& proxy_info,
                                     HttpRequestHeaders* headers);
   void NotifySendHeaders(URLRequest* request,
                          const HttpRequestHeaders& headers);
   int NotifyHeadersReceived(
       URLRequest* request,
@@ skipping 47 matching lines @@
                                  const CompletionCallback& callback,
                                  GURL* new_url);
 
   // Called as the proxy is being resolved for |url|. Allows the delegate to
   // override the proxy resolution decision made by ProxyService. The delegate
   // may override the decision by modifying the ProxyInfo |result|.
   virtual void OnResolveProxy(const GURL& url,
                               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
   // valid only until OnCompleted or OnURLRequestDestroyed is called for this
   // request.
   // See OnBeforeURLRequest for return value description. Returns OK by default.
   virtual int OnBeforeSendHeaders(URLRequest* request,
                                   const CompletionCallback& callback,
                                   HttpRequestHeaders* headers);
 
@@ skipping 112 matching lines @@
 
   // Called before a SocketStream tries to connect.
   // See OnBeforeURLRequest for return value description. Returns OK by default.
   virtual int OnBeforeSocketStreamConnect(
       SocketStream* socket, const CompletionCallback& callback);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_NETWORK_DELEGATE_H_