Introduce ERR_NETWORK_CHANGED and allow URLFetcher to automatically retry on that error.

net/url_request/url_fetcher_core.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_URL_REQUEST_URL_FETCHER_CORE_H_
 #define NET_URL_REQUEST_URL_FETCHER_CORE_H_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/debug/stack_trace.h"
 #include "base/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/platform_file.h"
 #include "base/timer.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/host_port_pair.h"
+#include "net/base/network_change_notifier.h"
 #include "net/http/http_request_headers.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_status.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace net {
 class HttpResponseHeaders;
 class IOBuffer;
 class URLFetcherDelegate;
 class URLRequestContextGetter;
 class URLRequestThrottlerEntryInterface;
 
 class URLFetcherCore
     : public base::RefCountedThreadSafe<URLFetcherCore>,
-      public URLRequest::Delegate {
+      public URLRequest::Delegate,
+      public NetworkChangeNotifier::ConnectionTypeObserver {

[szym, 2012/12/10 18:36:31]

Shouldn't it use NetworkChangeObserver?

[Joao da Silva, 2012/12/11 13:36:43]

This is only used to determine if IsOffline() changed, which only depends on the
connection type.

  public:
   URLFetcherCore(URLFetcher* fetcher,
                  const GURL& original_url,
                  URLFetcher::RequestType request_type,
                  URLFetcherDelegate* d);
 
   // Starts the load.  It's important that this not happen in the constructor
   // because it causes the IO thread to begin AddRef()ing and Release()ing
   // us.  If our caller hasn't had time to fully construct us and take a
   // reference, the IO thread could interrupt things, run a task, Release()
@@ skipping 27 matching lines @@
   // Set the URL that should be consulted for the third-party cookie
   // blocking policy.
   void SetFirstPartyForCookies(const GURL& first_party_for_cookies);
   // Set the key and data callback that is used when setting the user
   // data on any URLRequest objects this object creates.
   void SetURLRequestUserData(
       const void* key,
       const URLFetcher::CreateDataCallback& create_data_callback);
   void SetStopOnRedirect(bool stop_on_redirect);
   void SetAutomaticallyRetryOn5xx(bool retry);
-  void SetMaxRetries(int max_retries);
-  int GetMaxRetries() const;
+  void SetMaxRetriesOn5xx(int max_retries);
+  int GetMaxRetriesOn5xx() const;
   base::TimeDelta GetBackoffDelay() const;
+  void SetAutomaticallyRetryOnNetworkChanges(int max_retries);
   void SaveResponseToFileAtPath(
       const FilePath& file_path,
       scoped_refptr<base::TaskRunner> file_task_runner);
   void SaveResponseToTemporaryFile(
       scoped_refptr<base::TaskRunner> file_task_runner);
   HttpResponseHeaders* GetResponseHeaders() const;
   HostPortPair GetSocketAddress() const;
   bool WasFetchedViaProxy() const;
   const GURL& GetOriginalURL() const;
   const GURL& GetURL() const;
@@ skipping 13 matching lines @@
                              FilePath* out_response_path);
 
   // Overridden from URLRequest::Delegate:
   virtual void OnReceivedRedirect(URLRequest* request,
                                   const GURL& new_url,
                                   bool* defer_redirect) OVERRIDE;
   virtual void OnResponseStarted(URLRequest* request) OVERRIDE;
   virtual void OnReadCompleted(URLRequest* request,
                                int bytes_read) OVERRIDE;
 
+  // Overridden from NetworkChangeNotifier::ConnectionTypeObserver:
+  virtual void OnConnectionTypeChanged(
+      NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+
   URLFetcherDelegate* delegate() const { return delegate_; }
   static void CancelAll();
   static int GetNumFetcherCores();
   static void SetEnableInterceptionForTests(bool enabled);
 
  private:
   friend class base::RefCountedThreadSafe<URLFetcherCore>;
 
   // How should the response be stored?
   enum ResponseDestinationType {
@@ skipping 210 matching lines @@
   // URL A won't increase. If we retry without considering the
   // back-off constraint of URL B, we may send out too many requests
   // for URL A in a short period of time.
   //
   // Both of these will be NULL if
   // URLRequestContext::throttler_manager() is NULL.
   scoped_refptr<URLRequestThrottlerEntryInterface>
       original_url_throttler_entry_;
   scoped_refptr<URLRequestThrottlerEntryInterface> url_throttler_entry_;
 
-  // |num_retries_| indicates how many times we've failed to successfully
-  // fetch this URL.  Once this value exceeds the maximum number of retries
-  // specified by the owner URLFetcher instance, we'll give up.
-  int num_retries_;
-
   // True if the URLFetcher has been cancelled.
   bool was_cancelled_;
 
   // If writing results to a file, |file_writer_| will manage creation,
   // writing, and destruction of that file.
   scoped_ptr<FileWriter> file_writer_;
 
   // Where should responses be saved?
   ResponseDestinationType response_destination_;
 
   // Path to the file where the response is written.
   FilePath response_destination_file_path_;
 
   // By default any server-initiated redirects are automatically followed.  If
   // this flag is set to true, however, a redirect will halt the fetch and call
   // back to to the delegate immediately.
   bool stop_on_redirect_;
   // True when we're actually stopped due to a redirect halted by the above.  We
   // use this to ensure that |url_| is set to the redirect destination rather
   // than the originally-fetched URL.
   bool stopped_on_redirect_;
 
   // If |automatically_retry_on_5xx_| is false, 5xx responses will be
   // propagated to the observer, if it is true URLFetcher will automatically
   // re-execute the request, after the back-off delay has expired.
   // true by default.
   bool automatically_retry_on_5xx_;
-  // Maximum retries allowed.
-  int max_retries_;
+  // |num_retries_on_5xx_| indicates how many times we've failed to successfully
+  // fetch this URL due to 5xx responses.  Once this value exceeds the maximum
+  // number of retries specified by the owner URLFetcher instance,
+  // we'll give up.
+  int num_retries_on_5xx_;
+  // Maximum retries allowed when 5xx responses are received.
+  int max_retries_on_5xx_;
   // Back-off time delay. 0 by default.
   base::TimeDelta backoff_delay_;
 
+  // The number of retries that have been attempted due to ERR_NETWORK_CHANGED.
+  int num_retries_on_network_changes_;
+  // Maximum retries allowed when the request fails with ERR_NETWORK_CHANGED.
+  // 0 by default.
+  int max_retries_on_network_changes_;
+
   // Timer to poll the progress of uploading for POST and PUT requests.
   // When crbug.com/119629 is fixed, scoped_ptr is not necessary here.
   scoped_ptr<base::RepeatingTimer<URLFetcherCore> >
       upload_progress_checker_timer_;
   // Number of bytes sent so far.
   int64 current_upload_bytes_;
   // Number of bytes received so far.
   int64 current_response_bytes_;
   // Total expected bytes to receive (-1 if it cannot be determined).
   int64 total_response_bytes_;
 
   // TODO(willchan): Get rid of this after debugging crbug.com/90971.
   base::debug::StackTrace stack_trace_;
 
   static base::LazyInstance<Registry> g_registry;
 
   DISALLOW_COPY_AND_ASSIGN(URLFetcherCore);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_FETCHER_CORE_H_