Propagate the SafeBrowsing download protection verdict to the DownloadItem.

chrome/browser/download/download_manager_unittest.cc

 // Copyright (c) 2011 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 <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 127 matching lines @@
   scoped_refptr<content::DownloadBuffer> download_buffer_;
 
   DownloadFileManager* file_manager() {
     if (!file_manager_) {
       file_manager_ = new DownloadFileManager(NULL);
       download_manager_->file_manager_ = file_manager_;
     }
     return file_manager_;
   }
 
-  // Make sure download item |id| was set with correct safety state for
-  // given |is_dangerous_file| and |is_dangerous_url|.
-  bool VerifySafetyState(bool is_dangerous_file,
-                         bool is_dangerous_url,
-                         int id) {
-    DownloadItem::SafetyState safety_state =
-        download_manager_->GetDownloadItem(id)->safety_state();
-    return (is_dangerous_file || is_dangerous_url) ?
-        safety_state != DownloadItem::SAFE : safety_state == DownloadItem::SAFE;
-  }
-
   DISALLOW_COPY_AND_ASSIGN(DownloadManagerTest);
 };
 
 const char* DownloadManagerTest::kTestData = "a;sdlfalsdfjalsdkfjad";
 const size_t DownloadManagerTest::kTestDataLen =
     strlen(DownloadManagerTest::kTestData);
 
 // A DownloadFile that we can inject errors into.  Uses MockFileStream.
 // Note:  This can't be in an anonymous namespace because it must be declared
 // as a friend of |DownloadFile| in order to access its private members.
@@ skipping 79 matching lines @@
     false, },
   { "http://www.foo.com/always_prompt.jar",
     "application/jar",
     false,
     true,
     true, },
 };
 
 const struct {
   FilePath::StringType suggested_path;
-  bool is_dangerous_file;
-  bool is_dangerous_url;
+  DownloadStateInfo::DangerType danger;
   bool finish_before_rename;
   int expected_rename_count;
 } kDownloadRenameCases[] = {
   // Safe download, download finishes BEFORE file name determined.
   // Renamed twice (linear path through UI).  Crdownload file does not need
   // to be deleted.
-  { FILE_PATH_LITERAL("foo.zip"), false, false, true, 2, },
-  // Dangerous download (file is dangerous or download URL is not safe or both),
-  // download finishes BEFORE file name determined. Needs to be renamed only
-  // once.
-  { FILE_PATH_LITERAL("Unconfirmed xxx.crdownload"), true, false, true, 1, },
-  { FILE_PATH_LITERAL("Unconfirmed xxx.crdownload"), false, true, true, 1, },
-  { FILE_PATH_LITERAL("Unconfirmed xxx.crdownload"), true, true, true, 1, },
+  { FILE_PATH_LITERAL("foo.zip"), DownloadStateInfo::NOT_DANGEROUS, true, 2, },
+  // Potentially dangerous download (e.g., file is dangerous), download finishes
+  // BEFORE file name determined. Needs to be renamed only once.
+  { FILE_PATH_LITERAL("Unconfirmed xxx.crdownload"),
+    DownloadStateInfo::MAYBE_DANGEROUS_CONTENT, true, 1, },
+  { FILE_PATH_LITERAL("Unconfirmed xxx.crdownload"),
+    DownloadStateInfo::DANGEROUS_FILE, true, 1, },
   // Safe download, download finishes AFTER file name determined.
   // Needs to be renamed twice.
-  { FILE_PATH_LITERAL("foo.zip"), false, false, false, 2, },
-  // Dangerous download, download finishes AFTER file name determined.
-  // Needs to be renamed only once.
-  { FILE_PATH_LITERAL("Unconfirmed xxx.crdownload"), true, false, false, 1, },
-  { FILE_PATH_LITERAL("Unconfirmed xxx.crdownload"), false, true, false, 1, },
-  { FILE_PATH_LITERAL("Unconfirmed xxx.crdownload"), true, true, false, 1, },
+  { FILE_PATH_LITERAL("foo.zip"), DownloadStateInfo::NOT_DANGEROUS, false, 2, },
+  // Potentially dangerous download, download finishes AFTER file name
+  // determined. Needs to be renamed only once.
+  { FILE_PATH_LITERAL("Unconfirmed xxx.crdownload"),
+    DownloadStateInfo::MAYBE_DANGEROUS_CONTENT, false, 1, },
+  { FILE_PATH_LITERAL("Unconfirmed xxx.crdownload"),
+    DownloadStateInfo::DANGEROUS_FILE, false, 1, },
 };
 
 class MockDownloadFile : public DownloadFile {
  public:
   MockDownloadFile(DownloadCreateInfo* info, DownloadManager* manager)
       : DownloadFile(info, new DownloadRequestHandle(), manager),
         renamed_count_(0) { }
   virtual ~MockDownloadFile() { Destructed(); }
   MOCK_METHOD1(Rename, net::Error(const FilePath&));
   MOCK_METHOD0(Destructed, void());
@@ skipping 156 matching lines @@
           .WillOnce(testing::WithArgs<0>(Invoke(CreateFunctor(
               download_file, &MockDownloadFile::TestMultipleRename,
               1, crdownload))))
           .WillOnce(testing::WithArgs<0>(Invoke(CreateFunctor(
               download_file, &MockDownloadFile::TestMultipleRename,
               2, new_path))));
     }
     download_manager_->CreateDownloadItem(info.get(), DownloadRequestHandle());
     DownloadItem* download = GetActiveDownloadItem(i);
     ASSERT_TRUE(download != NULL);
-    if (kDownloadRenameCases[i].is_dangerous_file)
-      download->MarkFileDangerous();
-    if (kDownloadRenameCases[i].is_dangerous_url)
-      download->MarkUrlDangerous();
+    DownloadStateInfo state = download->state_info();
+    state.danger = kDownloadRenameCases[i].danger;
+    download->SetFileCheckResults(state);
 
     int32* id_ptr = new int32;
     *id_ptr = i;  // Deleted in FileSelected().
     if (kDownloadRenameCases[i].finish_before_rename) {
       OnResponseCompleted(i, 1024, std::string("fake_hash"));
       message_loop_.RunAllPending();
       FileSelected(new_path, id_ptr);
     } else {
       FileSelected(new_path, id_ptr);
       message_loop_.RunAllPending();
       OnResponseCompleted(i, 1024, std::string("fake_hash"));
     }
-
     message_loop_.RunAllPending();
-    EXPECT_TRUE(VerifySafetyState(kDownloadRenameCases[i].is_dangerous_file,
-                                  kDownloadRenameCases[i].is_dangerous_url,
-                                  i));
   }
 }
 
 TEST_F(DownloadManagerTest, DownloadInterruptTest) {
   using ::testing::_;
   using ::testing::CreateFunctor;
   using ::testing::Invoke;
   using ::testing::Return;
 
   // Normally, the download system takes ownership of info, and is
@@ skipping 396 matching lines @@
   EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING));
   EXPECT_TRUE(observer->was_updated());
   EXPECT_FALSE(observer->was_opened());
   EXPECT_TRUE(download->file_externally_removed());
   EXPECT_EQ(DownloadItem::COMPLETE, download->state());
   EXPECT_EQ(download_item_model->GetStatusText(),
             l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_REMOVED));
 
   EXPECT_FALSE(file_util::PathExists(new_path));
 }