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

chrome/browser/extensions/app_notify_channel_setup.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/browser/extensions/app_notify_channel_setup.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/metrics/histogram.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/net/gaia/gaia_urls.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/common/content_url_request_user_data.h"
 #include "content/public/common/url_fetcher.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_request_status.h"
 
 using base::StringPrintf;
 using content::BrowserThread;
 using content::URLFetcher;
@@ skipping 95 matching lines @@
 }
 
 // The contents of |body| should be URL-encoded as appropriate.
 URLFetcher* AppNotifyChannelSetup::CreateURLFetcher(
     const GURL& url, const std::string& body, const std::string& auth_token) {
   CHECK(url.is_valid());
   URLFetcher::RequestType type =
       body.empty() ? URLFetcher::GET : URLFetcher::POST;
   URLFetcher* fetcher = URLFetcher::Create(0, url, type, this);
   fetcher->SetRequestContext(profile_->GetRequestContext());
+  // No user data, as the request will be cookie-less.
+  fetcher->SetContentURLRequestUserData(
+      new content::ContentURLRequestUserData());
   // Always set flags to neither send nor save cookies.
   fetcher->SetLoadFlags(
       net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES);
   fetcher->SetExtraRequestHeaders(MakeAuthorizationHeader(auth_token));
   if (!body.empty()) {
     fetcher->SetUploadData("application/x-www-form-urlencoded", body);
   }
   return fetcher;
 }
 
@@ skipping 248 matching lines @@
   DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
   if (!dict->Get("id", &channel_id_value))
     return false;
   if (channel_id_value->GetType() != base::Value::TYPE_STRING)
     return false;
 
   StringValue* channel_id = static_cast<StringValue*>(channel_id_value);
   channel_id->GetAsString(result);
   return true;
 }