Revert 58196 - 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 161 matching lines @@
   { FILE_PATH_LITERAL("unconfirmed xxx.crdownload"),
     true,
     false,
     false,
     1, },
 };
 
 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());
   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();
   }
 }