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

chrome/service/cloud_print/cloud_print_url_fetcher.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/service/cloud_print/cloud_print_url_fetcher.h"
 
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/service/cloud_print/cloud_print_consts.h"
 #include "chrome/service/cloud_print/cloud_print_helpers.h"
 #include "chrome/service/cloud_print/cloud_print_token_store.h"
 #include "chrome/service/net/service_url_request_context.h"
 #include "chrome/service/service_process.h"
+#include "content/public/common/content_url_request_user_data.h"
 #include "googleurl/src/gurl.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_request_status.h"
 
 CloudPrintURLFetcher::CloudPrintURLFetcher()
     : delegate_(NULL),
       num_retries_(0) {
 }
 
 bool CloudPrintURLFetcher::IsSameRequest(const content::URLFetcher* source) {
@@ skipping 93 matching lines @@
     ++num_retries_;
     if ((-1 != source->GetMaxRetries()) &&
         (num_retries_ > source->GetMaxRetries())) {
       // Retry limit reached. Give up.
       delegate_->OnRequestGiveUp();
     } else {
       // Either no retry limit specified or retry limit has not yet been
       // reached. Try again. Set up the request headers again because the token
       // may have changed.
       SetupRequestHeaders();
-      request_->StartWithRequestContextGetter(GetRequestContextGetter());
+      // TODO(jochen): Do cookie audit.
+      request_->StartWithRequestContextGetterAndUserData(
+          GetRequestContextGetter(),
+          new content::ContentURLRequestUserData());
     }
   }
 }
 
 void CloudPrintURLFetcher::StartRequestHelper(
     const GURL& url,
     content::URLFetcher::RequestType request_type,
     Delegate* delegate,
     int max_retries,
     const std::string& post_data_mime_type,
     const std::string& post_data,
     const std::string& additional_headers) {
   DCHECK(delegate);
   // Persist the additional headers in case we need to retry the request.
   additional_headers_ = additional_headers;
   request_.reset(content::URLFetcher::Create(url, request_type, this));
   request_->SetRequestContext(GetRequestContextGetter());
+  // TODO(jochen): Do cookie audit.
+  request_->SetContentURLRequestUserData(
+      new content::ContentURLRequestUserData());
   // Since we implement our own retry logic, disable the retry in URLFetcher.
   request_->SetAutomaticallyRetryOn5xx(false);
   request_->SetMaxRetries(max_retries);
   delegate_ = delegate;
   SetupRequestHeaders();
   if (request_type == content::URLFetcher::POST) {
     request_->SetUploadData(post_data_mime_type, post_data);
   }
 
   request_->Start();
@@ skipping 15 matching lines @@
 
 net::URLRequestContextGetter* CloudPrintURLFetcher::GetRequestContextGetter() {
   ServiceURLRequestContextGetter* getter =
       g_service_process->GetServiceURLRequestContextGetter();
   // Now set up the user agent for cloudprint.
   std::string user_agent = getter->user_agent();
   base::StringAppendF(&user_agent, " %s", kCloudPrintUserAgent);
   getter->set_user_agent(user_agent);
   return getter;
 }