For downloads requiring a user gesture, also require...

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 <string>
 #include <set>
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util-inl.h"
@@ skipping 154 matching lines @@
 const struct {
   FilePath::StringType suggested_path;
   bool is_dangerous_file;
   bool is_dangerous_url;
   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, },
+  { 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("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, },
   // Safe download, download finishes AFTER file name determined.
   // Needs to be renamed twice.
-  { FILE_PATH_LITERAL("foo.zip"),
-    false, false, false, 2, },
+  { 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("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, },
 };
 
 class MockDownloadFile : public DownloadFile {
  public:
   MockDownloadFile(DownloadCreateInfo* info, DownloadManager* manager)
       : DownloadFile(info, manager), renamed_count_(0) { }
   virtual ~MockDownloadFile() { Destructed(); }
   MOCK_METHOD1(Rename, bool(const FilePath&));
   MOCK_METHOD0(Destructed, void());
 
@@ skipping 130 matching lines @@
   using ::testing::CreateFunctor;
   using ::testing::Invoke;
   using ::testing::Return;
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kDownloadRenameCases); ++i) {
     // |info| will be destroyed in download_manager_.
     DownloadCreateInfo* info(new DownloadCreateInfo);
     info->download_id = static_cast<int>(i);
     info->prompt_user_for_save_location = false;
     info->url_chain.push_back(GURL());
-    info->is_dangerous_file = kDownloadRenameCases[i].is_dangerous_file;
-    info->is_dangerous_url = kDownloadRenameCases[i].is_dangerous_url;
     const FilePath new_path(kDownloadRenameCases[i].suggested_path);
 
     MockDownloadFile* download_file(
         new MockDownloadFile(info, download_manager_));
     AddDownloadToFileManager(info->download_id, download_file);
 
     // |download_file| is owned by DownloadFileManager.
     ::testing::Mock::AllowLeak(download_file);
     EXPECT_CALL(*download_file, Destructed()).Times(1);
 
     if (kDownloadRenameCases[i].expected_rename_count == 1) {
       EXPECT_CALL(*download_file, Rename(new_path)).WillOnce(Return(true));
     } else {
       ASSERT_EQ(2, kDownloadRenameCases[i].expected_rename_count);
       FilePath crdownload(download_util::GetCrDownloadPath(new_path));
       EXPECT_CALL(*download_file, Rename(_))
           .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);
+    DownloadItem* download = GetActiveDownloadItem(i);
+    ASSERT_TRUE(download != NULL);
+    if (kDownloadRenameCases[i].is_dangerous_file)
+      download->MarkFileDangerous();
+    if (kDownloadRenameCases[i].is_dangerous_url)
+      download->MarkUrlDangerous();
 
     int32* id_ptr = new int32;
     *id_ptr = i;  // Deleted in FileSelected().
     if (kDownloadRenameCases[i].finish_before_rename) {
       OnAllDataSaved(i, 1024, std::string("fake_hash"));
       message_loop_.RunAllPending();
       FileSelected(new_path, i, id_ptr);
     } else {
       FileSelected(new_path, i, id_ptr);
       message_loop_.RunAllPending();
@@ skipping 11 matching lines @@
   using ::testing::_;
   using ::testing::CreateFunctor;
   using ::testing::Invoke;
   using ::testing::Return;
 
   // |info| will be destroyed in download_manager_.
   DownloadCreateInfo* info(new DownloadCreateInfo);
   info->download_id = static_cast<int>(0);
   info->prompt_user_for_save_location = false;
   info->url_chain.push_back(GURL());
-  info->is_dangerous_file = false;
-  info->is_dangerous_url = false;
   const FilePath new_path(FILE_PATH_LITERAL("foo.zip"));
   const FilePath cr_path(download_util::GetCrDownloadPath(new_path));
 
   MockDownloadFile* download_file(
       new MockDownloadFile(info, download_manager_));
   AddDownloadToFileManager(info->download_id, download_file);
 
   // |download_file| is owned by DownloadFileManager.
   ::testing::Mock::AllowLeak(download_file);
   EXPECT_CALL(*download_file, Destructed()).Times(1);
@@ skipping 43 matching lines @@
   using ::testing::_;
   using ::testing::CreateFunctor;
   using ::testing::Invoke;
   using ::testing::Return;
 
   // |info| will be destroyed in download_manager_.
   DownloadCreateInfo* info(new DownloadCreateInfo);
   info->download_id = static_cast<int>(0);
   info->prompt_user_for_save_location = false;
   info->url_chain.push_back(GURL());
-  info->is_dangerous_file = false;
-  info->is_dangerous_url = false;
   const FilePath new_path(FILE_PATH_LITERAL("foo.zip"));
   const FilePath cr_path(download_util::GetCrDownloadPath(new_path));
 
   MockDownloadFile* download_file(
       new MockDownloadFile(info, download_manager_));
   AddDownloadToFileManager(info->download_id, download_file);
 
   // |download_file| is owned by DownloadFileManager.
   ::testing::Mock::AllowLeak(download_file);
   EXPECT_CALL(*download_file, Destructed()).Times(1);
@@ skipping 56 matching lines @@
   int uniquifier = download_util::GetUniquePathNumber(new_path);
   FilePath unique_new_path = new_path;
   EXPECT_NE(0, uniquifier);
   download_util::AppendNumberToPath(&unique_new_path, uniquifier);
 
   // |info| will be destroyed in download_manager_.
   DownloadCreateInfo* info(new DownloadCreateInfo);
   info->download_id = static_cast<int>(0);
   info->prompt_user_for_save_location = true;
   info->url_chain.push_back(GURL());
-  info->is_dangerous_file = false;
-  info->is_dangerous_url = false;
 
   download_manager_->CreateDownloadItem(info);
 
   DownloadItem* download = GetActiveDownloadItem(0);
   ASSERT_TRUE(download != NULL);
 
   EXPECT_EQ(DownloadItem::IN_PROGRESS, download->state());
   scoped_ptr<ItemObserver> observer(new ItemObserver(download));
 
   // Create and initialize the download file.  We're bypassing the first part
@@ skipping 29 matching lines @@
   EXPECT_FALSE(observer->was_opened());
   EXPECT_EQ(DownloadItem::COMPLETE, download->state());
 
   EXPECT_TRUE(file_util::PathExists(new_path));
   EXPECT_FALSE(file_util::PathExists(cr_path));
   EXPECT_FALSE(file_util::PathExists(unique_new_path));
   std::string file_contents;
   EXPECT_TRUE(file_util::ReadFileToString(new_path, &file_contents));
   EXPECT_EQ(std::string(kTestData), file_contents);
 }