| Index: chrome/installer/util/installer_state_unittest.cc
|
| diff --git a/chrome/installer/util/installer_state_unittest.cc b/chrome/installer/util/installer_state_unittest.cc
|
| index a085817e1d15e70b0919e792d7b8e6f4dad06706..cf5247406e036de4a7a91ff17953a117fe1dd025 100644
|
| --- a/chrome/installer/util/installer_state_unittest.cc
|
| +++ b/chrome/installer/util/installer_state_unittest.cc
|
| @@ -97,27 +97,27 @@ TEST_F(InstallerStateTest, Delete) {
|
| // Create a Chrome dir
|
| base::FilePath chrome_dir(test_dir_.path());
|
| chrome_dir = chrome_dir.AppendASCII("chrome");
|
| - file_util::CreateDirectory(chrome_dir);
|
| + base::CreateDirectory(chrome_dir);
|
| ASSERT_TRUE(base::PathExists(chrome_dir));
|
|
|
| base::FilePath chrome_dir_1(chrome_dir);
|
| chrome_dir_1 = chrome_dir_1.AppendASCII("1.0.1.0");
|
| - file_util::CreateDirectory(chrome_dir_1);
|
| + base::CreateDirectory(chrome_dir_1);
|
| ASSERT_TRUE(base::PathExists(chrome_dir_1));
|
|
|
| base::FilePath chrome_dir_2(chrome_dir);
|
| chrome_dir_2 = chrome_dir_2.AppendASCII("1.0.2.0");
|
| - file_util::CreateDirectory(chrome_dir_2);
|
| + base::CreateDirectory(chrome_dir_2);
|
| ASSERT_TRUE(base::PathExists(chrome_dir_2));
|
|
|
| base::FilePath chrome_dir_3(chrome_dir);
|
| chrome_dir_3 = chrome_dir_3.AppendASCII("1.0.3.0");
|
| - file_util::CreateDirectory(chrome_dir_3);
|
| + base::CreateDirectory(chrome_dir_3);
|
| ASSERT_TRUE(base::PathExists(chrome_dir_3));
|
|
|
| base::FilePath chrome_dir_4(chrome_dir);
|
| chrome_dir_4 = chrome_dir_4.AppendASCII("1.0.4.0");
|
| - file_util::CreateDirectory(chrome_dir_4);
|
| + base::CreateDirectory(chrome_dir_4);
|
| ASSERT_TRUE(base::PathExists(chrome_dir_4));
|
|
|
| base::FilePath chrome_dll_1(chrome_dir_1);
|
| @@ -163,27 +163,27 @@ TEST_F(InstallerStateTest, DeleteInUsed) {
|
| // Create a Chrome dir
|
| base::FilePath chrome_dir(test_dir_.path());
|
| chrome_dir = chrome_dir.AppendASCII("chrome");
|
| - file_util::CreateDirectory(chrome_dir);
|
| + base::CreateDirectory(chrome_dir);
|
| ASSERT_TRUE(base::PathExists(chrome_dir));
|
|
|
| base::FilePath chrome_dir_1(chrome_dir);
|
| chrome_dir_1 = chrome_dir_1.AppendASCII("1.0.1.0");
|
| - file_util::CreateDirectory(chrome_dir_1);
|
| + base::CreateDirectory(chrome_dir_1);
|
| ASSERT_TRUE(base::PathExists(chrome_dir_1));
|
|
|
| base::FilePath chrome_dir_2(chrome_dir);
|
| chrome_dir_2 = chrome_dir_2.AppendASCII("1.0.2.0");
|
| - file_util::CreateDirectory(chrome_dir_2);
|
| + base::CreateDirectory(chrome_dir_2);
|
| ASSERT_TRUE(base::PathExists(chrome_dir_2));
|
|
|
| base::FilePath chrome_dir_3(chrome_dir);
|
| chrome_dir_3 = chrome_dir_3.AppendASCII("1.0.3.0");
|
| - file_util::CreateDirectory(chrome_dir_3);
|
| + base::CreateDirectory(chrome_dir_3);
|
| ASSERT_TRUE(base::PathExists(chrome_dir_3));
|
|
|
| base::FilePath chrome_dir_4(chrome_dir);
|
| chrome_dir_4 = chrome_dir_4.AppendASCII("1.0.4.0");
|
| - file_util::CreateDirectory(chrome_dir_4);
|
| + base::CreateDirectory(chrome_dir_4);
|
| ASSERT_TRUE(base::PathExists(chrome_dir_4));
|
|
|
| base::FilePath chrome_dll_1(chrome_dir_1);
|
| @@ -284,10 +284,10 @@ TEST_F(InstallerStateTest, Basic) {
|
| EXPECT_FALSE(base::PathExists(old_version_dir));
|
|
|
| EXPECT_FALSE(base::PathExists(installer_dir));
|
| - file_util::CreateDirectory(installer_dir);
|
| + base::CreateDirectory(installer_dir);
|
| EXPECT_TRUE(base::PathExists(new_version_dir));
|
|
|
| - file_util::CreateDirectory(old_version_dir);
|
| + base::CreateDirectory(old_version_dir);
|
| EXPECT_TRUE(base::PathExists(old_version_dir));
|
|
|
| // Create a fake chrome.dll key file in the old version directory. This
|
| @@ -534,7 +534,7 @@ TEST_F(InstallerStateTest, RemoveOldVersionDirs) {
|
|
|
| // Create the version directories.
|
| for (int i = 0; i < arraysize(version_dirs); i++) {
|
| - file_util::CreateDirectory(version_dirs[i]);
|
| + base::CreateDirectory(version_dirs[i]);
|
| EXPECT_TRUE(base::PathExists(version_dirs[i]));
|
| }
|
|
|
|
|