Index: chrome/installer/util/duplicate_tree_detector_unittest.cc |
diff --git a/chrome/installer/util/duplicate_tree_detector_unittest.cc b/chrome/installer/util/duplicate_tree_detector_unittest.cc |
index c9b50e8679a79e4f891f323adf4f76e1a9665fbc..90b667274d7c4679b3dc46fa5295b6ca7f00ed8c 100644 |
--- a/chrome/installer/util/duplicate_tree_detector_unittest.cc |
+++ b/chrome/installer/util/duplicate_tree_detector_unittest.cc |
@@ -80,74 +80,78 @@ const wchar_t DuplicateTreeDetectorTest::text_content_3_[] = |
// Test the DuplicateTreeChecker's definition of identity on two identical |
// directory structures. |
TEST_F(DuplicateTreeDetectorTest, TestIdenticalDirs) { |
- CreateTwoIdenticalHierarchies(temp_source_dir_.path(), temp_dest_dir_.path()); |
+ CreateTwoIdenticalHierarchies(temp_source_dir_.GetPath(), |
+ temp_dest_dir_.GetPath()); |
- EXPECT_TRUE(installer::IsIdenticalFileHierarchy(temp_source_dir_.path(), |
- temp_dest_dir_.path())); |
+ EXPECT_TRUE(installer::IsIdenticalFileHierarchy(temp_source_dir_.GetPath(), |
+ temp_dest_dir_.GetPath())); |
} |
// Test when source entirely contains dest but contains other files as well. |
// IsIdenticalTo should return false in this case. |
TEST_F(DuplicateTreeDetectorTest, TestSourceContainsDest) { |
- CreateTwoIdenticalHierarchies(temp_source_dir_.path(), temp_dest_dir_.path()); |
+ CreateTwoIdenticalHierarchies(temp_source_dir_.GetPath(), |
+ temp_dest_dir_.GetPath()); |
- base::FilePath new_file(temp_source_dir_.path()); |
+ base::FilePath new_file(temp_source_dir_.GetPath()); |
new_file = new_file.AppendASCII("FNew"); |
CreateTextFile(new_file.MaybeAsASCII(), text_content_1_); |
ASSERT_TRUE(base::PathExists(new_file)); |
- EXPECT_FALSE(installer::IsIdenticalFileHierarchy(temp_source_dir_.path(), |
- temp_dest_dir_.path())); |
+ EXPECT_FALSE(installer::IsIdenticalFileHierarchy(temp_source_dir_.GetPath(), |
+ temp_dest_dir_.GetPath())); |
} |
// Test when dest entirely contains source but contains other files as well. |
// IsIdenticalTo should return true in this case. |
TEST_F(DuplicateTreeDetectorTest, TestDestContainsSource) { |
- CreateTwoIdenticalHierarchies(temp_source_dir_.path(), temp_dest_dir_.path()); |
+ CreateTwoIdenticalHierarchies(temp_source_dir_.GetPath(), |
+ temp_dest_dir_.GetPath()); |
- base::FilePath new_file(temp_dest_dir_.path()); |
+ base::FilePath new_file(temp_dest_dir_.GetPath()); |
new_file = new_file.AppendASCII("FNew"); |
CreateTextFile(new_file.MaybeAsASCII(), text_content_1_); |
ASSERT_TRUE(base::PathExists(new_file)); |
- EXPECT_TRUE(installer::IsIdenticalFileHierarchy(temp_source_dir_.path(), |
- temp_dest_dir_.path())); |
+ EXPECT_TRUE(installer::IsIdenticalFileHierarchy(temp_source_dir_.GetPath(), |
+ temp_dest_dir_.GetPath())); |
} |
// Test when the file hierarchies are the same but one of the files is changed. |
TEST_F(DuplicateTreeDetectorTest, TestIdenticalDirsDifferentFiles) { |
- CreateTwoIdenticalHierarchies(temp_source_dir_.path(), temp_dest_dir_.path()); |
+ CreateTwoIdenticalHierarchies(temp_source_dir_.GetPath(), |
+ temp_dest_dir_.GetPath()); |
- base::FilePath existing_file(temp_dest_dir_.path()); |
+ base::FilePath existing_file(temp_dest_dir_.GetPath()); |
existing_file = existing_file.AppendASCII("D1") |
.AppendASCII("D2") |
.AppendASCII("F2"); |
CreateTextFile(existing_file.MaybeAsASCII(), text_content_3_); |
- EXPECT_FALSE(installer::IsIdenticalFileHierarchy(temp_source_dir_.path(), |
- temp_dest_dir_.path())); |
+ EXPECT_FALSE(installer::IsIdenticalFileHierarchy(temp_source_dir_.GetPath(), |
+ temp_dest_dir_.GetPath())); |
} |
// Test when both file hierarchies are empty. |
TEST_F(DuplicateTreeDetectorTest, TestEmptyDirs) { |
- EXPECT_TRUE(installer::IsIdenticalFileHierarchy(temp_source_dir_.path(), |
- temp_dest_dir_.path())); |
+ EXPECT_TRUE(installer::IsIdenticalFileHierarchy(temp_source_dir_.GetPath(), |
+ temp_dest_dir_.GetPath())); |
} |
// Test on single files. |
TEST_F(DuplicateTreeDetectorTest, TestSingleFiles) { |
// Create a source file. |
- base::FilePath source_file(temp_source_dir_.path()); |
+ base::FilePath source_file(temp_source_dir_.GetPath()); |
source_file = source_file.AppendASCII("F1"); |
CreateTextFile(source_file.MaybeAsASCII(), text_content_1_); |
// This file should be the same. |
- base::FilePath dest_file(temp_dest_dir_.path()); |
+ base::FilePath dest_file(temp_dest_dir_.GetPath()); |
dest_file = dest_file.AppendASCII("F1"); |
ASSERT_TRUE(installer::test::CopyFileHierarchy(source_file, dest_file)); |
// This file should be different. |
- base::FilePath other_file(temp_dest_dir_.path()); |
+ base::FilePath other_file(temp_dest_dir_.GetPath()); |
other_file = other_file.AppendASCII("F2"); |
CreateTextFile(other_file.MaybeAsASCII(), text_content_2_); |