Shifted DownloadFile to exporting DownloadInterruptReasons.

content/browser/download/download_file_manager_unittest.cc

 // Copyright (c) 2012 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 "content/browser/download/download_file_manager.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 187 matching lines @@
     EXPECT_EQ(content::DOWNLOAD_INTERRUPT_REASON_NONE, last_reason_);
   }
 
   // Renames the download file.
   // |id|           is the download ID of the download file.
   // |new_path|     is the new file path.
   // |unique_path|  is the actual path that the download file will be
   //                renamed to. If there is an existing file at
   //                |new_path| and |replace| is false, then |new_path|
   //                will be uniquified.
-  // |rename_error| is the error to inject.  For no error, use net::OK.
+  // |rename_error| is the error to inject.  For no error,
+  //                use content::DOWNLOAD_INTERRUPT_REASON_NONE.
   // |state|        whether we are renaming an in-progress download or a
   //                completed download.
   // |should_overwrite| indicates whether to replace or uniquify the file.
   void RenameFile(const DownloadId& id,
                   const FilePath& new_path,
                   const FilePath& unique_path,
-                  net::Error rename_error,
+                  content::DownloadInterruptReason rename_error,
                   RenameFileState state,
                   RenameFileOverwrite should_overwrite) {
     MockDownloadFile* file = download_file_factory_->GetExistingFile(id);
     ASSERT_TRUE(file != NULL);
 
     EXPECT_CALL(*file, Rename(unique_path))
         .Times(1)
         .WillOnce(Return(rename_error));
 
-    if (rename_error != net::OK) {
+    if (rename_error != content::DOWNLOAD_INTERRUPT_REASON_NONE) {
       EXPECT_CALL(*file, BytesSoFar())
           .Times(AtLeast(1))
           .WillRepeatedly(Return(byte_count_[id]));
       EXPECT_CALL(*file, GetHashState())
           .Times(AtLeast(1));
       EXPECT_CALL(*file, GetDownloadManager())
           .Times(AtLeast(1));
     }
 
     download_file_manager_->RenameDownloadFile(
         id, new_path, (should_overwrite == OVERWRITE),
         base::Bind(&TestDownloadManager::OnDownloadRenamed,
                    download_manager_, id.local()));
 
-    if (rename_error != net::OK) {
+    if (rename_error != content::DOWNLOAD_INTERRUPT_REASON_NONE) {
       EXPECT_CALL(*download_manager_,
                   OnDownloadInterrupted(
                       id.local(),
                       byte_count_[id],
                       "",
-                      content::ConvertNetErrorToInterruptReason(
-                          rename_error,
-                          content::DOWNLOAD_INTERRUPT_FROM_DISK)));
+                      rename_error));
       EXPECT_CALL(*download_manager_,
                   OnDownloadRenamed(id.local(), FilePath()));
       ProcessAllPendingMessages();
       ++error_count_[id];
     } else {
       EXPECT_CALL(*download_manager_,
                   OnDownloadRenamed(id.local(), unique_path));
       ProcessAllPendingMessages();
     }
   }
@@ skipping 90 matching lines @@
 TEST_F(DownloadFileManagerTest, RenameInProgress) {
   scoped_ptr<DownloadCreateInfo> info(new DownloadCreateInfo);
   DownloadId dummy_id(download_manager_.get(), kDummyDownloadId);
   info->download_id = dummy_id;
   ScopedTempDir download_dir;
   ASSERT_TRUE(download_dir.CreateUniqueTempDir());
 
   CreateDownloadFile(info.Pass());
 
   FilePath foo(download_dir.path().Append(FILE_PATH_LITERAL("foo.txt")));
-  RenameFile(dummy_id, foo, foo, net::OK, IN_PROGRESS, OVERWRITE);
+  RenameFile(dummy_id, foo, foo, content::DOWNLOAD_INTERRUPT_REASON_NONE,
+             IN_PROGRESS, OVERWRITE);
 
   CleanUp(dummy_id);
 }
 
 TEST_F(DownloadFileManagerTest, RenameInProgressWithUniquification) {
   scoped_ptr<DownloadCreateInfo> info(new DownloadCreateInfo);
   DownloadId dummy_id(download_manager_.get(), kDummyDownloadId);
   info->download_id = dummy_id;
   ScopedTempDir download_dir;
   ASSERT_TRUE(download_dir.CreateUniqueTempDir());
 
   CreateDownloadFile(info.Pass());
 
   FilePath foo(download_dir.path().Append(FILE_PATH_LITERAL("foo.txt")));
   FilePath unique_foo(foo.InsertBeforeExtension(FILE_PATH_LITERAL(" (1)")));
   ASSERT_EQ(0, file_util::WriteFile(foo, "", 0));
-  RenameFile(dummy_id, foo, unique_foo, net::OK, IN_PROGRESS, DONT_OVERWRITE);
+  RenameFile(dummy_id, foo, unique_foo,
+             content::DOWNLOAD_INTERRUPT_REASON_NONE, IN_PROGRESS,
+             DONT_OVERWRITE);
 
   CleanUp(dummy_id);
 }
 
 TEST_F(DownloadFileManagerTest, RenameInProgressWithError) {
   scoped_ptr<DownloadCreateInfo> info(new DownloadCreateInfo);
   DownloadId dummy_id(download_manager_.get(), kDummyDownloadId);
   info->download_id = dummy_id;
   ScopedTempDir download_dir;
   ASSERT_TRUE(download_dir.CreateUniqueTempDir());
 
   CreateDownloadFile(info.Pass());
 
   FilePath foo(download_dir.path().Append(FILE_PATH_LITERAL("foo.txt")));
-  RenameFile(dummy_id, foo, foo, net::ERR_FILE_PATH_TOO_LONG,
+  RenameFile(dummy_id, foo, foo,
+             content::DOWNLOAD_INTERRUPT_REASON_FILE_NAME_TOO_LONG,
              IN_PROGRESS, OVERWRITE);
 
   CleanUp(dummy_id);
 }
 
 TEST_F(DownloadFileManagerTest, RenameWithUniquification) {
   scoped_ptr<DownloadCreateInfo> info(new DownloadCreateInfo);
   DownloadId dummy_id(download_manager_.get(), kDummyDownloadId);
   info->download_id = dummy_id;
   ScopedTempDir download_dir;
   ASSERT_TRUE(download_dir.CreateUniqueTempDir());
 
   CreateDownloadFile(info.Pass());
 
   FilePath foo(download_dir.path().Append(FILE_PATH_LITERAL("foo.txt")));
   FilePath unique_foo(foo.InsertBeforeExtension(FILE_PATH_LITERAL(" (1)")));
   // Create a file at |foo|. Since we are specifying DONT_OVERWRITE,
   // RenameDownloadFile() should pick "foo (1).txt" instead of
   // overwriting this file.
   ASSERT_EQ(0, file_util::WriteFile(foo, "", 0));
-  RenameFile(dummy_id, foo, unique_foo, net::OK, COMPLETE, DONT_OVERWRITE);
+  RenameFile(dummy_id, foo, unique_foo,
+             content::DOWNLOAD_INTERRUPT_REASON_NONE, COMPLETE, DONT_OVERWRITE);
 
   CleanUp(dummy_id);
 }
 
 TEST_F(DownloadFileManagerTest, RenameTwice) {
   scoped_ptr<DownloadCreateInfo> info(new DownloadCreateInfo);
   DownloadId dummy_id(download_manager_.get(), kDummyDownloadId);
   info->download_id = dummy_id;
   ScopedTempDir download_dir;
   ASSERT_TRUE(download_dir.CreateUniqueTempDir());
 
   CreateDownloadFile(info.Pass());
 
   FilePath crfoo(download_dir.path().Append(
       FILE_PATH_LITERAL("foo.txt.crdownload")));
-  RenameFile(dummy_id, crfoo, crfoo, net::OK, IN_PROGRESS, OVERWRITE);
+  RenameFile(dummy_id, crfoo, crfoo, content::DOWNLOAD_INTERRUPT_REASON_NONE,
+             IN_PROGRESS, OVERWRITE);
 
   FilePath foo(download_dir.path().Append(FILE_PATH_LITERAL("foo.txt")));
-  RenameFile(dummy_id, foo, foo, net::OK, COMPLETE, OVERWRITE);
+  RenameFile(dummy_id, foo, foo, content::DOWNLOAD_INTERRUPT_REASON_NONE,
+             COMPLETE, OVERWRITE);
 
   CleanUp(dummy_id);
 }
 
 TEST_F(DownloadFileManagerTest, TwoDownloads) {
   // Same as StartDownload, at first.
   scoped_ptr<DownloadCreateInfo> info(new DownloadCreateInfo);
   DownloadId dummy_id(download_manager_.get(), kDummyDownloadId);
   info->download_id = dummy_id;
   scoped_ptr<DownloadCreateInfo> info2(new DownloadCreateInfo);
   DownloadId dummy_id2(download_manager_.get(), kDummyDownloadId2);
   info2->download_id = dummy_id2;
   ScopedTempDir download_dir;
   ASSERT_TRUE(download_dir.CreateUniqueTempDir());
 
   CreateDownloadFile(info.Pass());
   CreateDownloadFile(info2.Pass());
 
   FilePath crbar(download_dir.path().Append(
       FILE_PATH_LITERAL("bar.txt.crdownload")));
-  RenameFile(dummy_id2, crbar, crbar, net::OK, IN_PROGRESS, OVERWRITE);
+  RenameFile(dummy_id2, crbar, crbar, content::DOWNLOAD_INTERRUPT_REASON_NONE,
+             IN_PROGRESS, OVERWRITE);
 
   FilePath crfoo(download_dir.path().Append(
       FILE_PATH_LITERAL("foo.txt.crdownload")));
-  RenameFile(dummy_id, crfoo, crfoo, net::OK, IN_PROGRESS, OVERWRITE);
+  RenameFile(dummy_id, crfoo, crfoo, content::DOWNLOAD_INTERRUPT_REASON_NONE,
+             IN_PROGRESS, OVERWRITE);
 
 
   FilePath bar(download_dir.path().Append(FILE_PATH_LITERAL("bar.txt")));
-  RenameFile(dummy_id2, bar, bar, net::OK, COMPLETE, OVERWRITE);
+  RenameFile(dummy_id2, bar, bar, content::DOWNLOAD_INTERRUPT_REASON_NONE,
+             COMPLETE, OVERWRITE);
 
   CleanUp(dummy_id2);
 
   FilePath foo(download_dir.path().Append(FILE_PATH_LITERAL("foo.txt")));
-  RenameFile(dummy_id, foo, foo, net::OK, COMPLETE, OVERWRITE);
+  RenameFile(dummy_id, foo, foo, content::DOWNLOAD_INTERRUPT_REASON_NONE,
+             COMPLETE, OVERWRITE);
 
   CleanUp(dummy_id);
 }
 
 // TODO(ahendrickson) -- A test for download manager shutdown.
 // Expected call sequence:
 //  OnDownloadManagerShutdown
 //    DownloadFile::GetDownloadManager
 //    DownloadFile::CancelDownloadRequest
 //    DownloadFile::~DownloadFile