| 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..b92dc962cfe53bb5b4674dfa6dc5fc329ed52f50 100644
|
| --- a/chrome/browser/download/download_browsertest.cc
|
| +++ b/chrome/browser/download/download_browsertest.cc
|
| @@ -304,6 +304,7 @@ class DownloadTest : public InProcessBrowserTest {
|
| DownloadMethod download_method; // Navigation or Direct.
|
| InterruptReason reason; // Download interrupt reason (NONE is OK).
|
| bool show_download_item; // True if the download item appears on the shelf.
|
| + bool should_redirect_to_documents; // True if we save it in "My Documents".
|
| };
|
|
|
| DownloadTest() {
|
| @@ -681,6 +682,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 +694,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 +704,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 +737,47 @@ 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));
|
| +
|
| + EXPECT_EQ(download_info.should_redirect_to_documents ?
|
| + std::string::npos :
|
| + 0u,
|
| + my_downloaded_file.value().find(destination_folder.value()));
|
| + if (download_info.should_redirect_to_documents) {
|
| + // If it's not where we asked it to be, it should be in the
|
| + // My Documents folder.
|
| + FilePath my_docs_folder;
|
| + EXPECT_TRUE(PathService::Get(chrome::DIR_USER_DOCUMENTS,
|
| + &my_docs_folder));
|
| + EXPECT_TRUE(download_info.should_redirect_to_documents);
|
| + 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() << "'";
|
| + file_util::PermissionRestorer permission_restorer(destination_folder);
|
| + EXPECT_TRUE(file_util::MakeFileUnwritable(destination_folder));
|
| +
|
| + DownloadFileCheckErrors(download_info);
|
| + }
|
| +
|
| private:
|
| // Location of the test data.
|
| FilePath test_dir_;
|
| @@ -2009,7 +2051,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadNavigate) {
|
| "a_zip_file.zip",
|
| DOWNLOAD_NAVIGATE,
|
| DOWNLOAD_INTERRUPT_REASON_NONE,
|
| - true
|
| + true,
|
| + false
|
| };
|
|
|
| // Do initial setup.
|
| @@ -2022,7 +2065,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadDirect) {
|
| "a_zip_file.zip",
|
| DOWNLOAD_DIRECT,
|
| DOWNLOAD_INTERRUPT_REASON_NONE,
|
| - true
|
| + true,
|
| + false
|
| };
|
|
|
| // Do initial setup.
|
| @@ -2035,7 +2079,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadError404Direct) {
|
| "there_IS_no_spoon.zip",
|
| DOWNLOAD_DIRECT,
|
| DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT,
|
| - true
|
| + true,
|
| + false
|
| };
|
|
|
| // Do initial setup.
|
| @@ -2048,6 +2093,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadError404Navigate) {
|
| "there_IS_no_spoon.zip",
|
| DOWNLOAD_NAVIGATE,
|
| DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT,
|
| + false,
|
| false
|
| };
|
|
|
| @@ -2061,7 +2107,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadError400Direct) {
|
| "zip_file_not_found.zip",
|
| DOWNLOAD_DIRECT,
|
| DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED,
|
| - true
|
| + true,
|
| + false
|
| };
|
|
|
| // Do initial setup.
|
| @@ -2074,6 +2121,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadError400Navigate) {
|
| "zip_file_not_found.zip",
|
| DOWNLOAD_NAVIGATE,
|
| DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED,
|
| + false,
|
| false
|
| };
|
|
|
| @@ -2081,3 +2129,29 @@ 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,
|
| + 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,
|
| + true
|
| + };
|
| +
|
| + DownloadFileToReadonlyFolder(download_info);
|
| +}
|
|
|