| Index: chrome/browser/download/download_browsertest.cc
|
| diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
|
| index d3e0f19b564e8f9199c44fae8e5114aab17c18bb..82dcd3559c24dae45a30ee602a3542453218ef7e 100644
|
| --- a/chrome/browser/download/download_browsertest.cc
|
| +++ b/chrome/browser/download/download_browsertest.cc
|
| @@ -681,6 +681,7 @@ class DownloadTest : public InProcessBrowserTest {
|
| }
|
|
|
| // Attempts to download a file, based on information in |download_info|.
|
| + // If a Select File dialog opens, will automatically choose the default.
|
| void DownloadFileCheckErrors(const DownloadInfo& download_info) {
|
| ASSERT_TRUE(test_server()->Start());
|
| std::vector<DownloadItem*> download_items;
|
| @@ -692,6 +693,8 @@ class DownloadTest : public InProcessBrowserTest {
|
| GURL url = test_server()->GetURL(server_path);
|
| ASSERT_TRUE(url.is_valid());
|
|
|
| + NullSelectFile(browser()); // Needed for read-only tests.
|
| +
|
| DownloadManager* download_manager = DownloadManagerForBrowser(browser());
|
| scoped_ptr<DownloadTestObserver> observer(
|
| new DownloadTestObserver(
|
| @@ -700,7 +703,7 @@ class DownloadTest : public InProcessBrowserTest {
|
| download_info.reason == DOWNLOAD_INTERRUPT_REASON_NONE ?
|
| DownloadItem::COMPLETE : // Really done
|
| DownloadItem::INTERRUPTED,
|
| - true, // Bail on select file
|
| + false, // Don't finish on select file
|
| DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
|
|
|
| if (download_info.download_method == DOWNLOAD_DIRECT) {
|
| @@ -733,9 +736,49 @@ class DownloadTest : public InProcessBrowserTest {
|
| ASSERT_EQ(url, item->GetOriginalUrl());
|
|
|
| ASSERT_EQ(download_info.reason, item->GetLastReason());
|
| +
|
| + if (item->GetLastReason() == DOWNLOAD_INTERRUPT_REASON_NONE) {
|
| + // Clean up the file, in case it ended up in the My Documents folder.
|
| + FilePath destination_folder = GetDownloadDirectory(browser());
|
| + FilePath my_downloaded_file = item->GetTargetFilePath();
|
| + EXPECT_TRUE(file_util::PathExists(my_downloaded_file));
|
| + EXPECT_TRUE(file_util::Delete(my_downloaded_file, false));
|
| +
|
| + // If it's not where we asked it to be, it should be in the
|
| + // My Documents folder.
|
| + if (my_downloaded_file.value().find(destination_folder.value()) ==
|
| + std::string::npos) {
|
| + FilePath my_docs_folder;
|
| + EXPECT_TRUE(PathService::Get(chrome::DIR_USER_DOCUMENTS,
|
| + &my_docs_folder));
|
| + EXPECT_EQ(0u,
|
| + my_downloaded_file.value().find(my_docs_folder.value()));
|
| + }
|
| + }
|
| }
|
| }
|
|
|
| + // Attempts to download a file to a read-only folder, based on information
|
| + // in |download_info|.
|
| + void DownloadFileToReadonlyFolder(const DownloadInfo& download_info) {
|
| + ASSERT_TRUE(InitialSetup(false)); // Creates temporary download folder.
|
| +
|
| + // Make the test folder unwritable.
|
| + FilePath destination_folder = GetDownloadDirectory(browser());
|
| + DVLOG(1) << " " << __FUNCTION__ << "()"
|
| + << " folder = '" << destination_folder.value() << "'";
|
| + size_t perm_length = 0;
|
| + void* original_permissions =
|
| + file_util::GetPermissionInfo(destination_folder, &perm_length);
|
| + EXPECT_TRUE(original_permissions != NULL);
|
| + EXPECT_TRUE(file_util::MakeFileUnwritable(destination_folder));
|
| +
|
| + DownloadFileCheckErrors(download_info);
|
| +
|
| + EXPECT_TRUE(file_util::RestorePermissionInfo(destination_folder,
|
| + original_permissions,
|
| + perm_length));
|
| + }
|
| private:
|
| // Location of the test data.
|
| FilePath test_dir_;
|
| @@ -2081,3 +2124,27 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadError400Navigate) {
|
| ASSERT_TRUE(InitialSetup(false));
|
| DownloadFileCheckErrors(download_info);
|
| }
|
| +
|
| +IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadErrorReadonlyFolderDirect) {
|
| + DownloadInfo download_info = {
|
| + "a_zip_file.zip",
|
| + DOWNLOAD_DIRECT,
|
| + // This passes because we switch to the My Documents folder.
|
| + DOWNLOAD_INTERRUPT_REASON_NONE,
|
| + true
|
| + };
|
| +
|
| + DownloadFileToReadonlyFolder(download_info);
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadErrorReadonlyFolderNavigate) {
|
| + DownloadInfo download_info = {
|
| + "a_zip_file.zip",
|
| + DOWNLOAD_NAVIGATE,
|
| + // This passes because we switch to the My Documents folder.
|
| + DOWNLOAD_INTERRUPT_REASON_NONE,
|
| + true
|
| + };
|
| +
|
| + DownloadFileToReadonlyFolder(download_info);
|
| +}
|
|
|