diff options
| author | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-19 14:53:00 +0000 |
|---|---|---|
| committer | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-19 14:53:00 +0000 |
| commit | e2c1a644a1be1b3e0a99148ee3590b6da506d86e (patch) | |
| tree | 59a8b98bf0cf48cb8229d00cd98021622b6700e7 /content/browser/browser_main_loop.cc | |
| parent | 34df2abd18b58f0a0b41fc67237a2f33c75e91b2 (diff) | |
| download | chromium_src-e2c1a644a1be1b3e0a99148ee3590b6da506d86e.zip chromium_src-e2c1a644a1be1b3e0a99148ee3590b6da506d86e.tar.gz chromium_src-e2c1a644a1be1b3e0a99148ee3590b6da506d86e.tar.bz2 | |
Revert 152213 - Replace the DownloadFileManager with direct ownership of DownloadFile.
This CL is a re-land of http://codereview.chromium.org/10799005, which
was reverted due to test flakiness.
BUG=123998
R=benjhayden@chromium.org
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10836293
BUG=143600
TBR=rdsmith@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10861002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152282 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 5c418ff..faed5fc 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" @@ -565,8 +566,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_; |