Move initialization of ChromeURLRequestContexts to the IO thread.

chrome/browser/download/download_file.cc

 // Copyright (c) 2006-2008 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/download/download_file.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
+#include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/platform_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 389 matching lines @@
 void DownloadFileManager::OnDownloadFinished(int id,
                                              int64 bytes_so_far) {
   DCHECK(MessageLoop::current() == ui_loop_);
   DownloadManager* manager = LookupManager(id);
   if (manager)
     manager->DownloadFinished(id, bytes_so_far);
   RemoveDownload(id, manager);
   RemoveDownloadFromUIProgress(id);
 }
 
-void DownloadFileManager::DownloadUrl(const GURL& url,
-                                      const GURL& referrer,
-                                      int render_process_host_id,
-                                      int render_view_id,
-                                      URLRequestContext* request_context) {
+void DownloadFileManager::DownloadUrl(
+    const GURL& url,
+    const GURL& referrer,
+    const std::string& referrer_charset,
+    int render_process_host_id,
+    int render_view_id,
+    URLRequestContextGetter* request_context_getter) {
   DCHECK(MessageLoop::current() == ui_loop_);
   base::Thread* thread = g_browser_process->io_thread();
   if (thread) {
     thread->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(this,
                           &DownloadFileManager::OnDownloadUrl,
                           url,
                           referrer,
+                          referrer_charset,
                           render_process_host_id,
                           render_view_id,
-                          request_context));
+                          request_context_getter));
   }
 }
 
 // Relate a download ID to its owning DownloadManager.
 DownloadManager* DownloadFileManager::LookupManager(int download_id) {
   DCHECK(MessageLoop::current() == ui_loop_);
   DownloadManagerMap::iterator it = managers_.find(download_id);
   if (it != managers_.end())
     return it->second;
   return NULL;
@@ skipping 58 matching lines @@
     }
   }
 
   requests_.erase(it);
 }
 
 
 // Notifications from the UI thread and run on the IO thread
 
 // Initiate a request for URL to be downloaded.
-void DownloadFileManager::OnDownloadUrl(const GURL& url,
-                                        const GURL& referrer,
-                                        int render_process_host_id,
-                                        int render_view_id,
-                                        URLRequestContext* request_context) {
+void DownloadFileManager::OnDownloadUrl(
+    const GURL& url,
+    const GURL& referrer,
+    const std::string& referrer_charset,
+    int render_process_host_id,
+    int render_view_id,
+    URLRequestContextGetter* request_context_getter) {
   DCHECK(MessageLoop::current() == io_loop_);
+
+  URLRequestContext* context = request_context_getter->GetURLRequestContext();
+  context->set_referrer_charset(referrer_charset);
+
   resource_dispatcher_host_->BeginDownload(url,
                                            referrer,
                                            render_process_host_id,
                                            render_view_id,
-                                           request_context);
+                                           context);
 }
 
 // Actions from the UI thread and run on the download thread
 
 // Open a download, or show it in a file explorer window. We run on this
 // thread to avoid blocking the UI with (potentially) slow Shell operations.
 // TODO(paulg): File 'stat' operations.
 #if !defined(OS_MACOSX)
 void DownloadFileManager::OnShowDownloadInShell(const FilePath& full_path) {
   DCHECK(MessageLoop::current() == file_loop_);
@@ skipping 74 matching lines @@
     ui_loop_->PostTask(FROM_HERE, NewRunnableMethod(
         this, &DownloadFileManager::StopUpdateTimer));
 }
 
 // static
 void DownloadFileManager::DeleteFile(const FilePath& path) {
   // Make sure we only delete files.
   if (!file_util::DirectoryExists(path))
     file_util::Delete(path, false);
 }