// found in the LICENSE file.
#include "base/files/file_path.h"
+#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/message_loop/message_loop.h"
#include "base/prefs/pref_service.h"
#include "base/run_loop.h"
#include "chrome/browser/download/chrome_download_manager_delegate.h"
#include "chrome/browser/download/download_prefs.h"
+#include "chrome/browser/download/download_target_info.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "chrome/test/base/testing_pref_service_syncable.h"
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/test/mock_download_item.h"
#include "content/public/test/mock_download_manager.h"
-#include "content/public/test/test_browser_thread.h"
#include "content/public/test/test_renderer_host.h"
#include "content/public/test/web_contents_tester.h"
#include "testing/gmock/include/gmock/gmock.h"
FROM_HERE, base::Bind(arg0, result0, result1));
}
-struct DownloadTarget {
- base::FilePath target_path;
- base::FilePath intermediate_path;
- DownloadItem::TargetDisposition target_disposition;
- content::DownloadDangerType danger_type;
-};
-
// Subclass of the ChromeDownloadManagerDelegate that uses a mock
// DownloadProtectionService.
class TestChromeDownloadManagerDelegate : public ChromeDownloadManagerDelegate {
: ChromeDownloadManagerDelegate(profile) {
}
+ virtual ~TestChromeDownloadManagerDelegate() {}
+
virtual safe_browsing::DownloadProtectionService*
GetDownloadProtectionService() OVERRIDE {
return NULL;
content::DownloadItem*,
const base::FilePath&,
const DownloadTargetDeterminerDelegate::FileSelectedCallback&));
-
- private:
- ~TestChromeDownloadManagerDelegate() {}
};
-class ChromeDownloadManagerDelegateTest :
- public ChromeRenderViewHostTestHarness {
+class ChromeDownloadManagerDelegateTest
+ : public ChromeRenderViewHostTestHarness {
public:
ChromeDownloadManagerDelegateTest();
void SetDefaultDownloadPath(const base::FilePath& path);
void DetermineDownloadTarget(DownloadItem* download,
- DownloadTarget* result);
+ DownloadTargetInfo* result);
+
+ // Invokes ChromeDownloadManagerDelegate::CheckForFileExistence and waits for
+ // the asynchronous callback. The result passed into
+ // content::CheckForFileExistenceCallback is the return value from this
+ // method.
+ bool CheckForFileExistence(DownloadItem* download);
const base::FilePath& default_download_path() const;
TestChromeDownloadManagerDelegate* delegate();
DownloadPrefs* download_prefs();
private:
- void OnDownloadTargetDone(DownloadTarget* result,
- const base::FilePath& target_path,
- DownloadItem::TargetDisposition disposition,
- content::DownloadDangerType danger_type,
- const base::FilePath& intermediate_path);
-
TestingPrefServiceSyncable* pref_service_;
base::ScopedTempDir test_download_dir_;
scoped_ptr<content::MockDownloadManager> download_manager_;
- scoped_refptr<TestChromeDownloadManagerDelegate> delegate_;
+ scoped_ptr<TestChromeDownloadManagerDelegate> delegate_;
MockWebContentsDelegate web_contents_delegate_;
};
ChromeRenderViewHostTestHarness::SetUp();
CHECK(profile());
- delegate_ = new TestChromeDownloadManagerDelegate(profile());
+ delegate_.reset(new TestChromeDownloadManagerDelegate(profile()));
delegate_->SetDownloadManager(download_manager_.get());
pref_service_ = profile()->GetTestingPrefService();
web_contents()->SetDelegate(&web_contents_delegate_);
ON_CALL(*item, GetTargetFilePath())
.WillByDefault(ReturnRefOfCopy(base::FilePath()));
ON_CALL(*item, GetTransitionType())
- .WillByDefault(Return(content::PAGE_TRANSITION_LINK));
+ .WillByDefault(Return(ui::PAGE_TRANSITION_LINK));
ON_CALL(*item, GetWebContents())
.WillByDefault(Return(web_contents()));
ON_CALL(*item, HasUserGesture())
pref_service_->SetFilePath(prefs::kSaveFileDefaultDirectory, path);
}
+void StoreDownloadTargetInfo(const base::Closure& closure,
+ DownloadTargetInfo* target_info,
+ const base::FilePath& target_path,
+ DownloadItem::TargetDisposition target_disposition,
+ content::DownloadDangerType danger_type,
+ const base::FilePath& intermediate_path) {
+ target_info->target_path = target_path;
+ target_info->target_disposition = target_disposition;
+ target_info->danger_type = danger_type;
+ target_info->intermediate_path = intermediate_path;
+ closure.Run();
+}
+
void ChromeDownloadManagerDelegateTest::DetermineDownloadTarget(
DownloadItem* download_item,
- DownloadTarget* result) {
- base::WeakPtrFactory<ChromeDownloadManagerDelegateTest> factory(this);
+ DownloadTargetInfo* result) {
+ base::RunLoop loop_runner;
delegate()->DetermineDownloadTarget(
download_item,
- base::Bind(&ChromeDownloadManagerDelegateTest::OnDownloadTargetDone,
- factory.GetWeakPtr(), base::Unretained(result)));
- base::RunLoop loop_runner;
- loop_runner.RunUntilIdle();
+ base::Bind(&StoreDownloadTargetInfo, loop_runner.QuitClosure(), result));
+ loop_runner.Run();
+}
+
+void StoreBoolAndRunClosure(const base::Closure& closure,
+ bool* result_storage,
+ bool result) {
+ *result_storage = result;
+ closure.Run();
}
-void ChromeDownloadManagerDelegateTest::OnDownloadTargetDone(
- DownloadTarget* result,
- const base::FilePath& target_path,
- DownloadItem::TargetDisposition target_disposition,
- content::DownloadDangerType danger_type,
- const base::FilePath& intermediate_path) {
- result->target_path = target_path;
- result->intermediate_path = intermediate_path;
- result->target_disposition = target_disposition;
- result->danger_type = danger_type;
+bool ChromeDownloadManagerDelegateTest::CheckForFileExistence(
+ DownloadItem* download_item) {
+ base::RunLoop loop_runner;
+ bool result = false;
+ delegate()->CheckForFileExistence(
+ download_item,
+ base::Bind(&StoreBoolAndRunClosure, loop_runner.QuitClosure(), &result));
+ loop_runner.Run();
+ return result;
}
const base::FilePath& ChromeDownloadManagerDelegateTest::default_download_path()
{
// When the prompt is displayed for the first download, the user selects a
// path in a different directory.
- DownloadTarget result;
+ DownloadTargetInfo result;
base::FilePath expected_prompt_path(GetPathInDownloadDir("foo.txt"));
base::FilePath user_selected_path(GetPathInDownloadDir("bar/baz.txt"));
EXPECT_CALL(*delegate(),
{
// The prompt path for the second download is the user selected directroy
// from the previous download.
- DownloadTarget result;
+ DownloadTargetInfo result;
base::FilePath expected_prompt_path(GetPathInDownloadDir("bar/foo.txt"));
EXPECT_CALL(*delegate(),
MockPromptUserForDownloadPath(save_as_download.get(),
{
// Start an automatic download. This one should get the default download
// path since the last download path only affects Save As downloads.
- DownloadTarget result;
+ DownloadTargetInfo result;
base::FilePath expected_path(GetPathInDownloadDir("foo.txt"));
DetermineDownloadTarget(automatic_download.get(), &result);
EXPECT_EQ(expected_path, result.target_path);
{
// The prompt path for the next download should be the default.
download_prefs()->SetSaveFilePath(download_prefs()->DownloadPath());
- DownloadTarget result;
+ DownloadTargetInfo result;
base::FilePath expected_prompt_path(GetPathInDownloadDir("foo.txt"));
EXPECT_CALL(*delegate(),
MockPromptUserForDownloadPath(save_as_download.get(),
VerifyAndClearExpectations();
}
}
+
+TEST_F(ChromeDownloadManagerDelegateTest, CheckForFileExistence) {
+ const char kData[] = "helloworld";
+ const size_t kDataLength = sizeof(kData) - 1;
+ base::FilePath existing_path = default_download_path().AppendASCII("foo");
+ base::FilePath non_existent_path =
+ default_download_path().AppendASCII("bar");
+ base::WriteFile(existing_path, kData, kDataLength);
+
+ scoped_ptr<content::MockDownloadItem> download_item(
+ CreateActiveDownloadItem(1));
+ EXPECT_CALL(*download_item, GetTargetFilePath())
+ .WillRepeatedly(ReturnRef(existing_path));
+ EXPECT_TRUE(CheckForFileExistence(download_item.get()));
+
+ download_item.reset(CreateActiveDownloadItem(1));
+ EXPECT_CALL(*download_item, GetTargetFilePath())
+ .WillRepeatedly(ReturnRef(non_existent_path));
+ EXPECT_FALSE(CheckForFileExistence(download_item.get()));
+}
projects / platform / framework / web / crosswalk.git / blobdiff