Index: chrome/browser/download/download_target_determiner_unittest.cc |
diff --git a/chrome/browser/download/download_target_determiner_unittest.cc b/chrome/browser/download/download_target_determiner_unittest.cc |
index 93268f3b2a4ae7583b87ba3d0f68eee420556e88..a9a9b4ee5bf23dece8995ff74786470d7e1b8818 100644 |
--- a/chrome/browser/download/download_target_determiner_unittest.cc |
+++ b/chrome/browser/download/download_target_determiner_unittest.cc |
@@ -465,7 +465,7 @@ void MockDownloadTargetDeterminerDelegate::NullReserveVirtualPath( |
void MockDownloadTargetDeterminerDelegate::NullPromptUser( |
DownloadItem* download, const base::FilePath& suggested_path, |
const FileSelectedCallback& callback) { |
- callback.Run(suggested_path); |
+ callback.Run(suggested_path, false); |
} |
// static |
@@ -582,7 +582,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_CancelSaveAs) { |
} |
}; |
ON_CALL(*delegate(), PromptUserForDownloadPath(_, _, _)) |
- .WillByDefault(WithArg<2>(ScheduleCallback(base::FilePath()))); |
+ .WillByDefault(WithArg<2>(ScheduleCallback2(base::FilePath(), false))); |
RunTestCasesWithActiveItem(kCancelSaveAsTestCases, |
arraysize(kCancelSaveAsTestCases)); |
} |
@@ -877,8 +877,8 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_DefaultVirtual) { |
GetPathInDownloadDir(FILE_PATH_LITERAL("foo-local.txt"))))); |
EXPECT_CALL(*delegate(), PromptUserForDownloadPath( |
_, test_virtual_dir().AppendASCII("bar.txt"), _)) |
- .WillOnce(WithArg<2>(ScheduleCallback( |
- test_virtual_dir().AppendASCII("prompted.txt")))); |
+ .WillOnce(WithArg<2>(ScheduleCallback2( |
+ test_virtual_dir().AppendASCII("prompted.txt"), false))); |
RunTestCasesWithActiveItem(&kSaveAsToVirtualDir, 1); |
} |
@@ -897,8 +897,8 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_DefaultVirtual) { |
}; |
EXPECT_CALL(*delegate(), PromptUserForDownloadPath( |
_, test_virtual_dir().AppendASCII("bar.txt"), _)) |
- .WillOnce(WithArg<2>(ScheduleCallback( |
- GetPathInDownloadDir(FILE_PATH_LITERAL("foo-x.txt"))))); |
+ .WillOnce(WithArg<2>(ScheduleCallback2( |
+ GetPathInDownloadDir(FILE_PATH_LITERAL("foo-x.txt")), false))); |
RunTestCasesWithActiveItem(&kSaveAsToLocalDir, 1); |
} |
@@ -1433,7 +1433,7 @@ TEST_F(DownloadTargetDeterminerTest, |
EXPECT_CALL(*delegate(), |
PromptUserForDownloadPath(_, full_overridden_path, _)) |
.WillOnce(WithArg<2>( |
- ScheduleCallback(full_overridden_path))); |
+ ScheduleCallback2(full_overridden_path, false))); |
RunTestCase(test_case, base::FilePath(), item.get()); |
} |