Shifted DownloadFile to exporting DownloadInterruptReasons.

content/browser/download/download_file_manager_unittest.cc

Index: content/browser/download/download_file_manager_unittest.cc
diff --git a/content/browser/download/download_file_manager_unittest.cc b/content/browser/download/download_file_manager_unittest.cc
index 7de706ed1a075dcee33a81b2b6ba28fe966084f5..04290d4378b8d3df78fedf2763f88b60f8eae1a6 100644
--- a/content/browser/download/download_file_manager_unittest.cc
+++ b/content/browser/download/download_file_manager_unittest.cc
@@ -205,14 +205,15 @@ class DownloadFileManagerTest : public testing::Test {
   //                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);
@@ -222,7 +223,7 @@ class DownloadFileManagerTest : public testing::Test {
         .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]));
@@ -237,15 +238,13 @@ class DownloadFileManagerTest : public testing::Test {
         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();
@@ -356,7 +355,8 @@ TEST_F(DownloadFileManagerTest, RenameInProgress) {
   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);
 }
@@ -373,7 +373,9 @@ TEST_F(DownloadFileManagerTest, RenameInProgressWithUniquification) {
   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);
 }
@@ -388,7 +390,8 @@ TEST_F(DownloadFileManagerTest, RenameInProgressWithError) {
   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);
@@ -409,7 +412,8 @@ TEST_F(DownloadFileManagerTest, RenameWithUniquification) {
   // 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);
 }
@@ -425,10 +429,12 @@ TEST_F(DownloadFileManagerTest, RenameTwice) {
 
   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);
 }
@@ -449,20 +455,24 @@ TEST_F(DownloadFileManagerTest, TwoDownloads) {
 
   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);
 }