summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download/download_manager_unittest.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 02:56:23 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 02:56:23 +0000
commit771f68f817de7ce98949b29a68aa8778c7553640 (patch)
treebb1aafa5a9ad5b07f6e39e56c0a9cb7e6082bfa9 /chrome/browser/download/download_manager_unittest.cc
parentab253790c0385170f6f6f884cf16269e29265602 (diff)
downloadchromium_src-771f68f817de7ce98949b29a68aa8778c7553640.zip
chromium_src-771f68f817de7ce98949b29a68aa8778c7553640.tar.gz
chromium_src-771f68f817de7ce98949b29a68aa8778c7553640.tar.bz2
Reverting to see if this fixes linux ui tests hang. Just a shot in the dark at this
point. Revert 58087 - GTTF: Clean up DownloadFileManager This removes a lot of duplication, locking, and thread jumping. Most of the operations run on the FILE thread, and we do not duplicate so much information. Each DownloadFile keeps track of its DownloadManager (each Profile has its own DownloadManager). This allows us to remove many maps from DownloadFileManager that were duplicating that information. There is still SaveFileManager, but hopefully I will be able to merge those two in small steps. TEST=unit_tests, browser_tests, ui_tests BUG=48913 Review URL: http://codereview.chromium.org/3245005 TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3311001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/download_manager_unittest.cc')
-rw-r--r--chrome/browser/download/download_manager_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc
index 428ae8d..d63edc0 100644
--- a/chrome/browser/download/download_manager_unittest.cc
+++ b/chrome/browser/download/download_manager_unittest.cc
@@ -179,7 +179,7 @@ const struct {
class MockDownloadFile : public DownloadFile {
public:
explicit MockDownloadFile(DownloadCreateInfo* info)
- : DownloadFile(info, NULL), renamed_count_(0) { }
+ : DownloadFile(info), renamed_count_(0) { }
virtual ~MockDownloadFile() { Destructed(); }
MOCK_METHOD2(Rename, bool(const FilePath&, bool));
MOCK_METHOD0(DeleteCrDownload, void());