Make sure DownloadManager is shut down on the UI thread.

This fixes a pref-related crash.

TBR=darin

BUG=54128
TEST=memory_test and others; download a file and close the browser while it's downloading; should be no DCHECKs/segfaults

Review URL: http://codereview.chromium.org/3356005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58378 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 3 deletions

diff --git a/chrome/browser/download/download_manager.h b/chrome/browser/download/download_manager.h
index 9d2e9e1..60701e0 100644
--- a/chrome/browser/download/download_manager.h
+++ b/chrome/browser/download/download_manager.h
@@ -39,6 +39,7 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/shell_dialogs.h"
 
 class DownloadFileManager;
@@ -54,8 +55,10 @@ struct DownloadCreateInfo;
 struct DownloadSaveInfo;
 
 // Browser's download manager: manages all downloads and destination view.
-class DownloadManager : public base::RefCountedThreadSafe<DownloadManager>,
-                        public SelectFileDialog::Listener {
+class DownloadManager
+    : public base::RefCountedThreadSafe<DownloadManager,
+                                        ChromeThread::DeleteOnUIThread>,
+      public SelectFileDialog::Listener {
   // For testing.
   friend class DownloadManagerTest;
   friend class MockDownloadManager;
@@ -213,7 +216,8 @@ class DownloadManager : public base::RefCountedThreadSafe<DownloadManager>,
     DownloadManager* observed_download_manager_;
   };
 
-  friend class base::RefCountedThreadSafe<DownloadManager>;
+  friend class ChromeThread;
+  friend class DeleteTask<DownloadManager>;
   friend class OtherDownloadManagerObserver;
 
   ~DownloadManager();