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

chrome/browser/extensions/extension_updater.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/extension_updater.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 22 matching lines @@
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/utility_process_host.h"
+#include "content/public/common/content_url_request_user_data.h"
 #include "content/public/common/url_fetcher.h"
 #include "crypto/sha2.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
 
 #if defined(OS_MACOSX)
 #include "base/sys_string_conversions.h"
 #endif
@@ skipping 1166 matching lines @@
       std::string id_list = JoinString(id_vector, ',');
       VLOG(2) << "Fetching " << fetch_data->full_url() << " for "
               << id_list;
     }
 
     current_manifest_fetch_.swap(scoped_fetch_data);
     manifest_fetcher_.reset(content::URLFetcher::Create(
         kManifestFetcherId, fetch_data->full_url(), content::URLFetcher::GET,
         this));
     manifest_fetcher_->SetRequestContext(profile_->GetRequestContext());
+    // No user data, as the request will be cookie-less.
+    manifest_fetcher_->SetContentURLRequestUserData(
+        new content::ContentURLRequestUserData());
     manifest_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                                     net::LOAD_DO_NOT_SAVE_COOKIES |
                                     net::LOAD_DISABLE_CACHE);
     manifest_fetcher_->Start();
   }
 }
 
 void ExtensionUpdater::FetchUpdatedExtension(const std::string& id,
                                              const GURL& url,
                                              const std::string& hash,
                                              const std::string& version) {
   for (std::deque<ExtensionFetch>::const_iterator iter =
            extensions_pending_.begin();
        iter != extensions_pending_.end(); ++iter) {
     if (iter->id == id || iter->url == url) {
       return;  // already scheduled
     }
   }
 
   if (extension_fetcher_.get() != NULL) {
     if (extension_fetcher_->GetURL() != url) {
       extensions_pending_.push_back(ExtensionFetch(id, url, hash, version));
     }
   } else {
     extension_fetcher_.reset(content::URLFetcher::Create(
         kExtensionFetcherId, url, content::URLFetcher::GET, this));
     extension_fetcher_->SetRequestContext(
         profile_->GetRequestContext());
+    // No user data, as the request will be cookie-less.
+    extension_fetcher_->SetContentURLRequestUserData(
+        new content::ContentURLRequestUserData());
     extension_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                                      net::LOAD_DO_NOT_SAVE_COOKIES |
                                      net::LOAD_DISABLE_CACHE);
     // Download CRX files to a temp file. The blacklist is small and will be
     // processed in memory, so it is fetched into a string.
     if (id != ExtensionUpdater::kBlacklistAppID) {
       extension_fetcher_->SaveResponseToTemporaryFile(
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
     }
 
@@ skipping 32 matching lines @@
   std::set<std::string>::const_iterator i;
   for (i = ids.begin(); i != ids.end(); ++i)
     in_progress_ids_.insert(*i);
 }
 
 void ExtensionUpdater::RemoveFromInProgress(const std::set<std::string>& ids) {
   std::set<std::string>::const_iterator i;
   for (i = ids.begin(); i != ids.end(); ++i)
     in_progress_ids_.erase(*i);
 }