| Index: chrome/installer/setup/archive_patch_helper_unittest.cc
|
| diff --git a/chrome/installer/setup/archive_patch_helper_unittest.cc b/chrome/installer/setup/archive_patch_helper_unittest.cc
|
| index 8e6c996be48981b4a5f95443582a2d9d85a09fba..5a1f42b9917207430ec722426e603a64ead050d9 100644
|
| --- a/chrome/installer/setup/archive_patch_helper_unittest.cc
|
| +++ b/chrome/installer/setup/archive_patch_helper_unittest.cc
|
| @@ -49,11 +49,9 @@ base::FilePath ArchivePatchHelperTest::data_dir_;
|
| TEST_F(ArchivePatchHelperTest, Patching) {
|
| base::FilePath src = data_dir_.AppendASCII("archive1.7z");
|
| base::FilePath patch = data_dir_.AppendASCII("archive.diff");
|
| - base::FilePath dest = test_dir_.path().AppendASCII("archive2.7z");
|
| - installer::ArchivePatchHelper archive_helper(test_dir_.path(),
|
| - base::FilePath(),
|
| - src,
|
| - dest);
|
| + base::FilePath dest = test_dir_.GetPath().AppendASCII("archive2.7z");
|
| + installer::ArchivePatchHelper archive_helper(test_dir_.GetPath(),
|
| + base::FilePath(), src, dest);
|
| archive_helper.set_last_uncompressed_file(patch);
|
| EXPECT_TRUE(archive_helper.EnsemblePatch() || archive_helper.BinaryPatch());
|
| base::FilePath base = data_dir_.AppendASCII("archive2.7z");
|
| @@ -63,11 +61,9 @@ TEST_F(ArchivePatchHelperTest, Patching) {
|
| TEST_F(ArchivePatchHelperTest, InvalidDiff_MisalignedCblen) {
|
| base::FilePath src = data_dir_.AppendASCII("bin.old");
|
| base::FilePath patch = data_dir_.AppendASCII("misaligned_cblen.diff");
|
| - base::FilePath dest = test_dir_.path().AppendASCII("bin.new");
|
| - installer::ArchivePatchHelper archive_helper(test_dir_.path(),
|
| - base::FilePath(),
|
| - src,
|
| - dest);
|
| + base::FilePath dest = test_dir_.GetPath().AppendASCII("bin.new");
|
| + installer::ArchivePatchHelper archive_helper(test_dir_.GetPath(),
|
| + base::FilePath(), src, dest);
|
| archive_helper.set_last_uncompressed_file(patch);
|
| // Should fail, but not crash.
|
| EXPECT_FALSE(archive_helper.BinaryPatch());
|
| @@ -76,11 +72,9 @@ TEST_F(ArchivePatchHelperTest, InvalidDiff_MisalignedCblen) {
|
| TEST_F(ArchivePatchHelperTest, InvalidDiff_NegativeSeek) {
|
| base::FilePath src = data_dir_.AppendASCII("bin.old");
|
| base::FilePath patch = data_dir_.AppendASCII("negative_seek.diff");
|
| - base::FilePath dest = test_dir_.path().AppendASCII("bin.new");
|
| - installer::ArchivePatchHelper archive_helper(test_dir_.path(),
|
| - base::FilePath(),
|
| - src,
|
| - dest);
|
| + base::FilePath dest = test_dir_.GetPath().AppendASCII("bin.new");
|
| + installer::ArchivePatchHelper archive_helper(test_dir_.GetPath(),
|
| + base::FilePath(), src, dest);
|
| archive_helper.set_last_uncompressed_file(patch);
|
| // Should fail, but not crash.
|
| EXPECT_FALSE(archive_helper.BinaryPatch());
|
|
|