Do cookie checks in NetworkDelegate instead of the URLRequest::Delegate.

chrome/common/net/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 "chrome/common/net/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"
+#include "content/public/common/content_url_request_user_data.h"
 #include "content/public/common/url_fetcher.h"
 #include "content/public/common/url_fetcher_delegate.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace {
 const char kAccessTokenValue[] = "access_token";
 const char kRefreshTokenValue[] = "refresh_token";
@@ skipping 74 matching lines @@
 void GaiaOAuthClient::Core::MakeGaiaRequest(
     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(content::URLFetcher::Create(
       0, gaia_url_, content::URLFetcher::POST, this));
   request_->SetRequestContext(request_context_getter_);
+  // TODO(jochen): Do cookie audit.
+  request_->SetContentURLRequestUserData(
+      new content::ContentURLRequestUserData());
   request_->SetUploadData("application/x-www-form-urlencoded", post_body);
   request_->SetMaxRetries(max_retries);
   request_->Start();
 }
 
 // URLFetcher::Delegate implementation.
 void GaiaOAuthClient::Core::OnURLFetchComplete(
     const content::URLFetcher* source) {
   bool should_retry = false;
   HandleResponse(source, &should_retry);
   if (should_retry) {
     // Explicitly call ReceivedContentWasMalformed() to ensure the current
     // request gets counted as a failure for calculation of the back-off
     // period.  If it was already a failure by status code, this call will
     // be ignored.
     request_->ReceivedContentWasMalformed();
     num_retries_++;
     // We must set our request_context_getter_ again because
     // URLFetcher::Core::RetryOrCompleteUrlFetch resets it to NULL...
     request_->SetRequestContext(request_context_getter_);
+    // TODO(jochen): Do cookie audit.
+    request_->SetContentURLRequestUserData(
+        new content::ContentURLRequestUserData());
     request_->Start();
   } else {
     request_.reset();
   }
 }
 
 void GaiaOAuthClient::Core::HandleResponse(
     const content::URLFetcher* source,
     bool* should_retry_request) {
   *should_retry_request = false;
@@ skipping 63 matching lines @@
                                    const std::string& refresh_token,
                                    int max_retries,
                                    Delegate* delegate) {
   return core_->RefreshToken(oauth_client_info,
                              refresh_token,
                              max_retries,
                              delegate);
 }
 
 }  // namespace gaia