diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 19:59:05 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 19:59:05 +0000 |
commit | 0302e4ac5907fcdaafbf2a883b29496032c0db19 (patch) | |
tree | 1dc0581bfb318593416b8d872a0f5f528eabf8e4 /chrome/installer/util/helper_unittest.cc | |
parent | de17ab159c33d8a89dcccae69c167c5d4a6cda68 (diff) | |
download | chromium_src-0302e4ac5907fcdaafbf2a883b29496032c0db19.zip chromium_src-0302e4ac5907fcdaafbf2a883b29496032c0db19.tar.gz chromium_src-0302e4ac5907fcdaafbf2a883b29496032c0db19.tar.bz2 |
Remove uses of deprecated version of PathService::Get() in the installer.
Review URL: http://codereview.chromium.org/109033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/helper_unittest.cc')
-rw-r--r-- | chrome/installer/util/helper_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/installer/util/helper_unittest.cc b/chrome/installer/util/helper_unittest.cc index 3152bc1..9430f25 100644 --- a/chrome/installer/util/helper_unittest.cc +++ b/chrome/installer/util/helper_unittest.cc @@ -22,11 +22,11 @@ namespace { virtual void SetUp() { // Name a subdirectory of the user temp directory. ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_)); - file_util::AppendToPath(&test_dir_, L"SetupHelperTest"); + test_dir_.AppendASCII("SetupHelperTest"); // Create a fresh, empty copy of this test directory. file_util::Delete(test_dir_, true); - CreateDirectory(test_dir_.c_str(), NULL); + file_util::CreateDirectoryW(test_dir_); ASSERT_TRUE(file_util::PathExists(test_dir_)); } @@ -38,7 +38,7 @@ namespace { } // the path to temporary directory used to contain the test operations - std::wstring test_dir_; + FilePath test_dir_; }; // Simple function to dump some text into a new file. @@ -59,7 +59,7 @@ namespace { // should be deleted. TEST_F(SetupHelperTest, Delete) { // Create a Chrome dir - std::wstring chrome_dir(test_dir_); + std::wstring chrome_dir(test_dir_.ToWStringHack()); file_util::AppendToPath(&chrome_dir, L"chrome"); CreateDirectory(chrome_dir.c_str(), NULL); ASSERT_TRUE(file_util::PathExists(chrome_dir)); @@ -118,7 +118,7 @@ TEST_F(SetupHelperTest, Delete) { // Delete older version directories, keeping the one in used intact. TEST_F(SetupHelperTest, DeleteInUsed) { // Create a Chrome dir - std::wstring chrome_dir(test_dir_); + std::wstring chrome_dir(test_dir_.ToWStringHack()); file_util::AppendToPath(&chrome_dir, L"chrome"); CreateDirectory(chrome_dir.c_str(), NULL); ASSERT_TRUE(file_util::PathExists(chrome_dir)); |