GTTF: Clean up DownloadFileManager

chrome/browser/download/download_manager_unittest.cc

 // Copyright (c) 2010 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 <string>
 
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/download/download_file.h"
@@ skipping 20 matching lines @@
 class DownloadManagerTest : public testing::Test {
  public:
   DownloadManagerTest()
       : profile_(new TestingProfile()),
         download_manager_(new MockDownloadManager()),
         ui_thread_(ChromeThread::UI, &message_loop_) {
     download_manager_->Init(profile_.get());
   }
 
   ~DownloadManagerTest() {
+    download_manager_->Shutdown();
     // profile_ must outlive download_manager_, so we explicitly delete
     // download_manager_ first.
     download_manager_ = NULL;
     profile_.reset(NULL);
     message_loop_.RunAllPending();
   }
 
   void AddDownloadToFileManager(int id, DownloadFile* download) {
     file_manager()->downloads_[id] = download;
   }
@@ skipping 121 matching lines @@
   { FILE_PATH_LITERAL("unconfirmed xxx.crdownload"),
     true,
     false,
     false,
     1, },
 };
 
 class MockDownloadFile : public DownloadFile {
  public:
   explicit MockDownloadFile(DownloadCreateInfo* info)
-      : DownloadFile(info), renamed_count_(0) { }
+      : DownloadFile(info, NULL), renamed_count_(0) { }
   virtual ~MockDownloadFile() { Destructed(); }
   MOCK_METHOD2(Rename, bool(const FilePath&, bool));
   MOCK_METHOD0(DeleteCrDownload, void());
   MOCK_METHOD0(Destructed, void());
 
   bool TestMultipleRename(
       int expected_count, bool expected_final, const FilePath& expected,
       const FilePath& path, bool is_final_rename) {
     ++renamed_count_;
     EXPECT_EQ(expected_count, renamed_count_);
@@ skipping 52 matching lines @@
       download_manager_->DownloadFinished(i, 1024);
       download_manager_->FileSelected(new_path, i, info);
     } else {
       download_manager_->FileSelected(new_path, i, info);
       download_manager_->DownloadFinished(i, 1024);
     }
 
     message_loop_.RunAllPending();
   }
 }