diff options
| author | yutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 09:44:38 +0000 |
|---|---|---|
| committer | yutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 09:44:38 +0000 |
| commit | 46aa0bd31745f793edeac06a043af8d9bafec063 (patch) | |
| tree | 758e63378ee563e4cbbbcf2848df461c6dd58fbd /content/browser/browser_main_loop.cc | |
| parent | e090d5d38530d15e1105416db98ef46a2ef48bd2 (diff) | |
| download | chromium_src-46aa0bd31745f793edeac06a043af8d9bafec063.zip chromium_src-46aa0bd31745f793edeac06a043af8d9bafec063.tar.gz chromium_src-46aa0bd31745f793edeac06a043af8d9bafec063.tar.bz2 | |
Revert 151351 - Replace the DownloadFileManager with direct ownership
of DownloadFileImpl by DownloadItemImpl.
BUG=123998
R=benjhayden@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10799005
TBR=rdsmith@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10827314
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151443 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index d56b746..50ce699 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -16,6 +16,7 @@ #include "base/string_number_conversions.h" #include "base/threading/thread_restrictions.h" #include "content/browser/browser_thread_impl.h" +#include "content/browser/download/download_file_manager.h" #include "content/browser/download/save_file_manager.h" #include "content/browser/gamepad/gamepad_service.h" #include "content/browser/gpu/browser_gpu_channel_host_factory.h" @@ -552,8 +553,10 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() { // Clean up state that lives on or uses the file_thread_ before // it goes away. - if (resource_dispatcher_host_.get()) + if (resource_dispatcher_host_.get()) { + resource_dispatcher_host_.get()->download_file_manager()->Shutdown(); resource_dispatcher_host_.get()->save_file_manager()->Shutdown(); + } break; case BrowserThread::PROCESS_LAUNCHER: thread_to_stop = &process_launcher_thread_; |