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

google_apis/gaia/gaia_oauth_client.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 "google_apis/gaia/gaia_oauth_client.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
@@ skipping 110 matching lines @@
   DCHECK(!request_.get());
   request_type_ = USER_INFO;
   delegate_ = delegate;
   num_retries_ = 0;
   request_.reset(net::URLFetcher::Create(
       0, GURL(GaiaUrls::GetInstance()->oauth_user_info_url()),
       net::URLFetcher::GET, this));
   request_->SetRequestContext(request_context_getter_);
   request_->AddExtraRequestHeader(
       "Authorization: OAuth " + oauth_access_token);
-  request_->SetMaxRetries(max_retries);
+  request_->SetMaxRetriesOn5xx(max_retries);
   request_->Start();
 }
 
 void GaiaOAuthClient::Core::MakeGaiaRequest(
     const std::string& post_body,
     int max_retries,
     GaiaOAuthClient::Delegate* delegate) {
   DCHECK(!request_.get()) << "Tried to fetch two things at once!";
   delegate_ = delegate;
   num_retries_ = 0;
   request_.reset(net::URLFetcher::Create(
       0, gaia_url_, net::URLFetcher::POST, this));
   request_->SetRequestContext(request_context_getter_);
   request_->SetUploadData("application/x-www-form-urlencoded", post_body);
-  request_->SetMaxRetries(max_retries);
+  request_->SetMaxRetriesOn5xx(max_retries);
   request_->Start();
 }
 
 // URLFetcher::Delegate implementation.
 void GaiaOAuthClient::Core::OnURLFetchComplete(
     const net::URLFetcher* source) {
   bool should_retry = false;
   HandleResponse(source, &should_retry);
   if (should_retry) {
     // Explicitly call ReceivedContentWasMalformed() to ensure the current
@@ skipping 31 matching lines @@
     if (message_value.get() &&
         message_value->IsType(Value::TYPE_DICTIONARY)) {
       response_dict.reset(
           static_cast<DictionaryValue*>(message_value.release()));
     }
   }
 
   if (!response_dict.get()) {
     // If we don't have an access token yet and the the error was not
     // RC_BAD_REQUEST, we may need to retry.
-    if ((source->GetMaxRetries() != -1) &&
-        (num_retries_ > source->GetMaxRetries())) {
+    if ((source->GetMaxRetriesOn5xx() != -1) &&
+        (num_retries_ > source->GetMaxRetriesOn5xx())) {
       // Retry limit reached. Give up.
       delegate_->OnNetworkError(source->GetResponseCode());
     } else {
       request_ = old_request.Pass();
       *should_retry_request = true;
     }
     return;
   }
 
   RequestType type = request_type_;
@@ skipping 65 matching lines @@
                              delegate);
 }
 
 void GaiaOAuthClient::GetUserInfo(const std::string& access_token,
                                   int max_retries,
                                   Delegate* delegate) {
   return core_->GetUserInfo(access_token, max_retries, delegate);
 }
 
 }  // namespace gaia