More progress towards removing content settings code from the content layer. We can't use Cookie...

chrome/browser/download/download_util.cc

 // Copyright (c) 2011 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.
 //
 // Download utility implementation
 
 #include "chrome/browser/download/download_util.h"
 
 #if defined(OS_WIN)
 #include <shobjidl.h>
@@ skipping 17 matching lines @@
 #include "base/win/windows_version.h"
 #include "chrome/browser/download/download_extensions.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_types.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/history/download_create_info.h"
-#include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/time_format.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
@@ skipping 742 matching lines @@
 }
 
 void DownloadUrl(
     const GURL& url,
     const GURL& referrer,
     const std::string& referrer_charset,
     const DownloadSaveInfo& save_info,
     ResourceDispatcherHost* rdh,
     int render_process_host_id,
     int render_view_id,
-    net::URLRequestContextGetter* request_context_getter) {
+    const content::ResourceContext* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  net::URLRequestContext* context =
-      request_context_getter->GetURLRequestContext();
-  context->set_referrer_charset(referrer_charset);
-
   rdh->BeginDownload(url,
                      referrer,
                      save_info,
                      true,  // Show "Save as" UI.
                      render_process_host_id,
                      render_view_id,
-                     context);
+                     *context);
 }
 
 void CancelDownloadRequest(ResourceDispatcherHost* rdh,
                            int render_process_id,
                            int request_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // |rdh| may be NULL in unit tests.
   if (rdh)
     rdh->CancelRequest(render_process_id, request_id, false);
 }
@@ skipping 70 matching lines @@
     // Extensions that are not from the gallery are considered dangerous.
     ExtensionService* service = profile->GetExtensionService();
     if (!service ||
         !service->IsDownloadFromGallery(info->url(), info->referrer_url))
       return true;
   }
   return false;
 }
 
 }  // namespace download_util