diff options
Diffstat (limited to 'chromium/content/browser/download')
8 files changed, 6 insertions, 51 deletions
diff --git a/chromium/content/browser/download/download_browsertest.cc b/chromium/content/browser/download/download_browsertest.cc index 516ae18d861..79ad19c9839 100644 --- a/chromium/content/browser/download/download_browsertest.cc +++ b/chromium/content/browser/download/download_browsertest.cc @@ -22,14 +22,12 @@ #include "content/public/browser/power_save_blocker.h" #include "content/public/common/content_switches.h" #include "content/public/common/webplugininfo.h" -#include "content/public/test/browser_test_utils.h" #include "content/public/test/download_test_observer.h" #include "content/public/test/test_file_error_injector.h" #include "content/public/test/test_utils.h" #include "content/shell/shell.h" #include "content/shell/shell_browser_context.h" #include "content/shell/shell_download_manager_delegate.h" -#include "content/shell/shell_network_delegate.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_mock_http_job.h" @@ -1600,42 +1598,4 @@ IN_PROC_BROWSER_TEST_F(DownloadContentTest, CancelResumingDownload) { EXPECT_TRUE(EnsureNoPendingDownloads()); } -// Check that the cookie policy is correctly updated when downloading a file -// that redirects cross origin. -IN_PROC_BROWSER_TEST_F(DownloadContentTest, CookiePolicy) { - ASSERT_TRUE(test_server()->Start()); - net::HostPortPair host_port = test_server()->host_port_pair(); - DCHECK_EQ(host_port.host(), std::string("127.0.0.1")); - - // Block third-party cookies. - ShellNetworkDelegate::SetAcceptAllCookies(false); - - // |url| redirects to a different origin |download| which tries to set a - // cookie. - std::string download(base::StringPrintf( - "http://localhost:%d/set-cookie?A=B", host_port.port())); - GURL url(test_server()->GetURL("server-redirect?" + download)); - - // Download the file. - SetupEnsureNoPendingDownloads(); - scoped_ptr<DownloadUrlParameters> dl_params( - DownloadUrlParameters::FromWebContents(shell()->web_contents(), url)); - scoped_ptr<DownloadTestObserver> observer(CreateWaiter(shell(), 1)); - DownloadManagerForShell(shell())->DownloadUrl(dl_params.Pass()); - observer->WaitForFinished(); - - // Get the important info from other threads and check it. - EXPECT_TRUE(EnsureNoPendingDownloads()); - - std::vector<DownloadItem*> downloads; - DownloadManagerForShell(shell())->GetAllDownloads(&downloads); - ASSERT_EQ(1u, downloads.size()); - ASSERT_EQ(DownloadItem::COMPLETE, downloads[0]->GetState()); - - // Check that the cookies were correctly set. - EXPECT_EQ("A=B", - content::GetCookies(shell()->web_contents()->GetBrowserContext(), - GURL(download))); -} - } // namespace content diff --git a/chromium/content/browser/download/download_file_unittest.cc b/chromium/content/browser/download/download_file_unittest.cc index 49e418c85bc..867b76f6fef 100644 --- a/chromium/content/browser/download/download_file_unittest.cc +++ b/chromium/content/browser/download/download_file_unittest.cc @@ -76,7 +76,6 @@ class DownloadFileTest : public testing::Test { DownloadFileTest() : observer_(new StrictMock<MockDownloadDestinationObserver>), observer_factory_(observer_.get()), - input_stream_(NULL), bytes_(-1), bytes_per_sec_(-1), hash_state_("xyzzy"), diff --git a/chromium/content/browser/download/download_manager_impl_unittest.cc b/chromium/content/browser/download/download_manager_impl_unittest.cc index 0865c04b2fa..eba28339b51 100644 --- a/chromium/content/browser/download/download_manager_impl_unittest.cc +++ b/chromium/content/browser/download/download_manager_impl_unittest.cc @@ -435,8 +435,7 @@ class DownloadManagerTest : public testing::Test { static const size_t kTestDataLen; DownloadManagerTest() - : callback_called_(false), - ui_thread_(BrowserThread::UI, &message_loop_), + : ui_thread_(BrowserThread::UI, &message_loop_), file_thread_(BrowserThread::FILE, &message_loop_), next_download_id_(0) { } diff --git a/chromium/content/browser/download/download_resource_handler.cc b/chromium/content/browser/download/download_resource_handler.cc index ed4edff67fe..3b4844e6e68 100644 --- a/chromium/content/browser/download/download_resource_handler.cc +++ b/chromium/content/browser/download/download_resource_handler.cc @@ -103,9 +103,6 @@ bool DownloadResourceHandler::OnRequestRedirected( const GURL& url, ResourceResponse* response, bool* defer) { - // We treat a download as a main frame load, and thus update the policy URL - // on redirects. - request_->set_first_party_for_cookies(url); return true; } diff --git a/chromium/content/browser/download/download_resource_handler.h b/chromium/content/browser/download/download_resource_handler.h index 60fbc944387..d38068d5482 100644 --- a/chromium/content/browser/download/download_resource_handler.h +++ b/chromium/content/browser/download/download_resource_handler.h @@ -49,6 +49,7 @@ class CONTENT_EXPORT DownloadResourceHandler uint64 position, uint64 size) OVERRIDE; + // Not needed, as this event handler ought to be the final resource. virtual bool OnRequestRedirected(int request_id, const GURL& url, ResourceResponse* response, diff --git a/chromium/content/browser/download/file_metadata_unittest_linux.cc b/chromium/content/browser/download/file_metadata_unittest_linux.cc index 4a3ebca5a2c..bc8666e076c 100644 --- a/chromium/content/browser/download/file_metadata_unittest_linux.cc +++ b/chromium/content/browser/download/file_metadata_unittest_linux.cc @@ -30,8 +30,7 @@ class FileMetadataLinuxTest : public testing::Test { public: FileMetadataLinuxTest() : source_url_("http://www.source.com"), - referrer_url_("http://www.referrer.com"), - is_xattr_supported_(false) {} + referrer_url_("http://www.referrer.com") {} const base::FilePath& test_file() const { return test_file_; diff --git a/chromium/content/browser/download/save_package.cc b/chromium/content/browser/download/save_package.cc index 8a9781d82b0..a386a2be0c3 100644 --- a/chromium/content/browser/download/save_package.cc +++ b/chromium/content/browser/download/save_package.cc @@ -971,11 +971,11 @@ void SavePackage::DoSavingProcess() { // sub-resource's link can be replaced with local file path, which // sub-resource's link need to be replaced with absolute URL which // point to its internet address because it got error when saving its data. - + SaveItem* save_item = NULL; // Start a new SaveItem job if we still have job in waiting queue. if (waiting_item_queue_.size()) { DCHECK(wait_state_ == NET_FILES); - SaveItem* save_item = waiting_item_queue_.front(); + save_item = waiting_item_queue_.front(); if (save_item->save_source() != SaveFileCreateInfo::SAVE_FILE_FROM_DOM) { SaveNextFile(false); } else if (!in_process_count()) { diff --git a/chromium/content/browser/download/save_package_unittest.cc b/chromium/content/browser/download/save_package_unittest.cc index c0aa3f8862b..9c8f29f46be 100644 --- a/chromium/content/browser/download/save_package_unittest.cc +++ b/chromium/content/browser/download/save_package_unittest.cc @@ -434,7 +434,7 @@ TEST_F(SavePackageTest, TestGetUrlToBeSavedViewSource) { base::FilePath(kTestDir).Append(file_name)); NavigateAndCommit(view_source_url); EXPECT_EQ(actual_url, GetUrlToBeSaved()); - EXPECT_EQ(view_source_url, contents()->GetLastCommittedURL()); + EXPECT_EQ(view_source_url, contents()->GetURL()); } } // namespace content |