diff options
Diffstat (limited to 'chrome/installer/util')
18 files changed, 59 insertions, 59 deletions
diff --git a/chrome/installer/util/copy_tree_work_item.h b/chrome/installer/util/copy_tree_work_item.h index 3b41f06..c62a601 100644 --- a/chrome/installer/util/copy_tree_work_item.h +++ b/chrome/installer/util/copy_tree_work_item.h @@ -6,8 +6,8 @@ #define CHROME_INSTALLER_UTIL_COPY_TREE_WORK_ITEM_H_ #include "base/file_path.h" +#include "base/files/scoped_temp_dir.h" #include "base/gtest_prod_util.h" -#include "base/scoped_temp_dir.h" #include "chrome/installer/util/work_item.h" // A WorkItem subclass that recursively copies a file system hierarchy from @@ -77,7 +77,7 @@ class CopyTreeWorkItem : public WorkItem { bool copied_to_alternate_path_; // The temporary directory into which the original dest_path_ has been moved. - ScopedTempDir backup_path_; + base::ScopedTempDir backup_path_; FRIEND_TEST_ALL_PREFIXES(CopyTreeWorkItemTest, CopyFileSameContent); FRIEND_TEST_ALL_PREFIXES(CopyTreeWorkItemTest, CopyFileInUse); diff --git a/chrome/installer/util/copy_tree_work_item_unittest.cc b/chrome/installer/util/copy_tree_work_item_unittest.cc index 3a19a4c..d9e0b6c 100644 --- a/chrome/installer/util/copy_tree_work_item_unittest.cc +++ b/chrome/installer/util/copy_tree_work_item_unittest.cc @@ -8,11 +8,11 @@ #include "base/base_paths.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/threading/platform_thread.h" #include "chrome/installer/util/copy_tree_work_item.h" @@ -32,8 +32,8 @@ namespace { } // the path to temporary directory used to contain the test operations - ScopedTempDir test_dir_; - ScopedTempDir temp_dir_; + base::ScopedTempDir test_dir_; + base::ScopedTempDir temp_dir_; }; // Simple function to dump some text into a new file. diff --git a/chrome/installer/util/create_dir_work_item_unittest.cc b/chrome/installer/util/create_dir_work_item_unittest.cc index 6d97bbe..76db1a6 100644 --- a/chrome/installer/util/create_dir_work_item_unittest.cc +++ b/chrome/installer/util/create_dir_work_item_unittest.cc @@ -6,9 +6,9 @@ #include "base/base_paths.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "chrome/installer/util/create_dir_work_item.h" #include "chrome/installer/util/work_item.h" @@ -21,7 +21,7 @@ namespace { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); } - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; }; }; diff --git a/chrome/installer/util/delete_tree_work_item.cc b/chrome/installer/util/delete_tree_work_item.cc index 812c1d0..31e06bd 100644 --- a/chrome/installer/util/delete_tree_work_item.cc +++ b/chrome/installer/util/delete_tree_work_item.cc @@ -38,7 +38,7 @@ DeleteTreeWorkItem::DeleteTreeWorkItem( NOTREACHED() << "Impossibly large key_paths collection"; } else if (num_key_files_ != 0) { key_paths_.reset(new FilePath[num_key_files_]); - key_backup_paths_.reset(new ScopedTempDir[num_key_files_]); + key_backup_paths_.reset(new base::ScopedTempDir[num_key_files_]); std::copy(key_paths.begin(), key_paths.end(), &key_paths_[0]); } } @@ -57,7 +57,7 @@ bool DeleteTreeWorkItem::Do() { bool abort = false; for (ptrdiff_t i = 0; !abort && i != num_key_files_; ++i) { FilePath& key_file = key_paths_[i]; - ScopedTempDir& backup = key_backup_paths_[i]; + base::ScopedTempDir& backup = key_backup_paths_[i]; if (!ignore_failure_) { if (!backup.CreateUniqueTempDirUnderPath(temp_path_)) { PLOG(ERROR) << "Could not create temp dir in " << temp_path_.value(); @@ -147,7 +147,7 @@ void DeleteTreeWorkItem::Rollback() { } for (ptrdiff_t i = 0; i != num_key_files_; ++i) { - ScopedTempDir& backup_dir = key_backup_paths_[i]; + base::ScopedTempDir& backup_dir = key_backup_paths_[i]; if (!backup_dir.path().empty()) { FilePath& key_file = key_paths_[i]; FilePath backup_file = backup_dir.path().Append(key_file.BaseName()); diff --git a/chrome/installer/util/delete_tree_work_item.h b/chrome/installer/util/delete_tree_work_item.h index 2bf7471..aba34ca 100644 --- a/chrome/installer/util/delete_tree_work_item.h +++ b/chrome/installer/util/delete_tree_work_item.h @@ -8,8 +8,8 @@ #include <vector> #include "base/file_path.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" -#include "base/scoped_temp_dir.h" #include "chrome/installer/util/work_item.h" // A WorkItem subclass that recursively deletes a file system hierarchy at the @@ -47,11 +47,11 @@ class DeleteTreeWorkItem : public WorkItem { // Contains the temp directories for the backed-up key files. The directories // are created and populated in Do() as-needed. We don't use a standard - // container for this since ScopedTempDir isn't CopyConstructible. - scoped_array<ScopedTempDir> key_backup_paths_; + // container for this since base::ScopedTempDir isn't CopyConstructible. + scoped_array<base::ScopedTempDir> key_backup_paths_; // The temporary directory into which the original root_path_ has been moved. - ScopedTempDir backup_path_; + base::ScopedTempDir backup_path_; // Set to true once root_path_ has been copied into backup_path_. bool copied_to_backup_; diff --git a/chrome/installer/util/delete_tree_work_item_unittest.cc b/chrome/installer/util/delete_tree_work_item_unittest.cc index 239e098..e2b601d 100644 --- a/chrome/installer/util/delete_tree_work_item_unittest.cc +++ b/chrome/installer/util/delete_tree_work_item_unittest.cc @@ -8,11 +8,11 @@ #include "base/base_paths.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "chrome/installer/util/delete_tree_work_item.h" #include "chrome/installer/util/work_item.h" @@ -26,7 +26,7 @@ namespace { } // The temporary directory used to contain the test operations. - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; }; // Simple function to dump some text into a new file. @@ -72,7 +72,7 @@ TEST_F(DeleteTreeWorkItemTest, DeleteTreeNoKeyPath) { ASSERT_TRUE(file_util::PathExists(file_name_delete_2)); // Test Do(). - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); std::vector<FilePath> key_files; @@ -124,7 +124,7 @@ TEST_F(DeleteTreeWorkItemTest, DeleteTree) { ASSERT_TRUE(file_util::PathExists(file_name_delete_2)); // test Do() - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); std::vector<FilePath> key_files(1, file_name_delete_1); @@ -197,7 +197,7 @@ TEST_F(DeleteTreeWorkItemTest, DeleteTreeInUse) { // test Do(). { - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); std::vector<FilePath> key_paths(1, key_path); diff --git a/chrome/installer/util/duplicate_tree_detector_unittest.cc b/chrome/installer/util/duplicate_tree_detector_unittest.cc index d1445dc..fb02194 100644 --- a/chrome/installer/util/duplicate_tree_detector_unittest.cc +++ b/chrome/installer/util/duplicate_tree_detector_unittest.cc @@ -7,7 +7,7 @@ #include <fstream> #include "base/file_util.h" -#include "base/scoped_temp_dir.h" +#include "base/files/scoped_temp_dir.h" #include "base/string16.h" #include "base/string_util.h" #include "chrome/installer/util/duplicate_tree_detector.h" @@ -60,8 +60,8 @@ class DuplicateTreeDetectorTest : public testing::Test { ASSERT_TRUE(installer::test::CopyFileHierarchy(d1, second_root)); } - ScopedTempDir temp_source_dir_; - ScopedTempDir temp_dest_dir_; + base::ScopedTempDir temp_source_dir_; + base::ScopedTempDir temp_dest_dir_; static const wchar_t text_content_1_[]; static const wchar_t text_content_2_[]; diff --git a/chrome/installer/util/installer_state_unittest.cc b/chrome/installer/util/installer_state_unittest.cc index b7e1bd0..f62ea1b 100644 --- a/chrome/installer/util/installer_state_unittest.cc +++ b/chrome/installer/util/installer_state_unittest.cc @@ -10,9 +10,9 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/test/test_reg_util_win.h" #include "base/utf_string_conversions.h" @@ -144,7 +144,7 @@ TEST_F(InstallerStateTest, Delete) { BuildSingleChromeState(chrome_dir, &installer_state); Version latest_version("1.0.4.0"); { - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); installer_state.RemoveOldVersionDirectories(latest_version, NULL, temp_dir.path()); @@ -225,7 +225,7 @@ TEST_F(InstallerStateTest, DeleteInUsed) { Version latest_version("1.0.4.0"); Version existing_version("1.0.1.0"); { - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); installer_state.RemoveOldVersionDirectories(latest_version, &existing_version, @@ -302,7 +302,7 @@ TEST_F(InstallerStateTest, Basic) { EXPECT_TRUE(file.IsValid()); EXPECT_TRUE(file_util::PathExists(old_chrome_dll)); - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); // Don't explicitly tell the directory cleanup logic not to delete the @@ -469,7 +469,7 @@ TEST_F(InstallerStateTest, GetCurrentVersionMigrateChrome) { } TEST_F(InstallerStateTest, IsFileInUse) { - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); FilePath temp_file; diff --git a/chrome/installer/util/logging_installer_unittest.cc b/chrome/installer/util/logging_installer_unittest.cc index e77b046..0a858dd 100644 --- a/chrome/installer/util/logging_installer_unittest.cc +++ b/chrome/installer/util/logging_installer_unittest.cc @@ -6,8 +6,8 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/platform_file.h" -#include "base/scoped_temp_dir.h" #include "base/win/scoped_handle.h" #include "chrome/installer/util/logging_installer.h" #include "testing/gtest/include/gtest/gtest.h" @@ -15,7 +15,7 @@ TEST(LoggingInstallerTest, TestTruncate) { const std::string test_data(installer::kMaxInstallerLogFileSize + 1, 'a'); - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); FilePath temp_file = temp_dir.path().Append(L"temp"); @@ -40,7 +40,7 @@ TEST(LoggingInstallerTest, TestTruncate) { TEST(LoggingInstallerTest, TestTruncationNotNeeded) { const std::string test_data(installer::kMaxInstallerLogFileSize, 'a'); - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); FilePath temp_file = temp_dir.path().Append(L"temp"); @@ -62,7 +62,7 @@ TEST(LoggingInstallerTest, TestTruncationNotNeeded) { TEST(LoggingInstallerTest, TestInUseNeedsTruncation) { const std::string test_data(installer::kMaxInstallerLogFileSize + 1, 'a'); - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); FilePath temp_file = temp_dir.path().Append(L"temp"); @@ -91,7 +91,7 @@ TEST(LoggingInstallerTest, TestInUseNeedsTruncation) { TEST(LoggingInstallerTest, TestMoveFailsNeedsTruncation) { const std::string test_data(installer::kMaxInstallerLogFileSize + 1, 'a'); - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); FilePath temp_file = temp_dir.path().Append(L"temp"); diff --git a/chrome/installer/util/lzma_util_unittest.cc b/chrome/installer/util/lzma_util_unittest.cc index 06a8dfd..c4c87eb 100644 --- a/chrome/installer/util/lzma_util_unittest.cc +++ b/chrome/installer/util/lzma_util_unittest.cc @@ -5,9 +5,9 @@ #include <windows.h> #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/scoped_temp_dir.h" #include "chrome/common/chrome_paths.h" #include "chrome/installer/util/lzma_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -23,7 +23,7 @@ class LzmaUtilTest : public testing::Test { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); } - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; // The path to input data used in tests. FilePath data_dir_; diff --git a/chrome/installer/util/move_tree_work_item.h b/chrome/installer/util/move_tree_work_item.h index 62a84ba..cde9302 100644 --- a/chrome/installer/util/move_tree_work_item.h +++ b/chrome/installer/util/move_tree_work_item.h @@ -6,8 +6,8 @@ #define CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_ #include "base/file_path.h" +#include "base/files/scoped_temp_dir.h" #include "base/gtest_prod_util.h" -#include "base/scoped_temp_dir.h" #include "chrome/installer/util/work_item.h" // A WorkItem subclass that recursively move a file system hierarchy from @@ -57,7 +57,7 @@ class MoveTreeWorkItem : public WorkItem { FilePath temp_dir_; // The temporary directory into which the original dest_path_ has been moved. - ScopedTempDir backup_path_; + base::ScopedTempDir backup_path_; // Whether the source was moved to dest_path_ bool moved_to_dest_path_; diff --git a/chrome/installer/util/move_tree_work_item_unittest.cc b/chrome/installer/util/move_tree_work_item_unittest.cc index ebe47d2..9b1e93b 100644 --- a/chrome/installer/util/move_tree_work_item_unittest.cc +++ b/chrome/installer/util/move_tree_work_item_unittest.cc @@ -25,8 +25,8 @@ class MoveTreeWorkItemTest : public testing::Test { ASSERT_TRUE(temp_to_dir_.CreateUniqueTempDir()); } - ScopedTempDir temp_from_dir_; - ScopedTempDir temp_to_dir_; + base::ScopedTempDir temp_from_dir_; + base::ScopedTempDir temp_to_dir_; }; // Simple function to dump some text into a new file. diff --git a/chrome/installer/util/product_unittest.h b/chrome/installer/util/product_unittest.h index 167afa9..05c903c 100644 --- a/chrome/installer/util/product_unittest.h +++ b/chrome/installer/util/product_unittest.h @@ -9,8 +9,8 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" class TestWithTempDir : public testing::Test { @@ -18,7 +18,7 @@ class TestWithTempDir : public testing::Test { virtual void SetUp(); virtual void TearDown(); - ScopedTempDir test_dir_; + base::ScopedTempDir test_dir_; }; class TestWithTempDirAndDeleteTempOverrideKeys : public TestWithTempDir { diff --git a/chrome/installer/util/self_cleaning_temp_dir.cc b/chrome/installer/util/self_cleaning_temp_dir.cc index a95a722..5a498ac 100644 --- a/chrome/installer/util/self_cleaning_temp_dir.cc +++ b/chrome/installer/util/self_cleaning_temp_dir.cc @@ -76,7 +76,7 @@ bool SelfCleaningTempDir::Delete() { bool schedule_deletes = false; // First try to recursively delete the leaf directory managed by our - // ScopedTempDir. + // base::ScopedTempDir. if (!file_util::Delete(path(), true)) { // That failed, so schedule the temp dir and its contents for deletion after // reboot. diff --git a/chrome/installer/util/self_cleaning_temp_dir.h b/chrome/installer/util/self_cleaning_temp_dir.h index f76c6f6..6e46ce2 100644 --- a/chrome/installer/util/self_cleaning_temp_dir.h +++ b/chrome/installer/util/self_cleaning_temp_dir.h @@ -12,7 +12,7 @@ namespace installer { // A helper class for managing a temporary directory. In relation to -// ScopedTempDir, this class additionally cleans up all non-empty parent +// base::ScopedTempDir, this class additionally cleans up all non-empty parent // directories of the temporary directory that are created by an instance. class SelfCleaningTempDir { public: diff --git a/chrome/installer/util/self_cleaning_temp_dir_unittest.cc b/chrome/installer/util/self_cleaning_temp_dir_unittest.cc index 3cc3878..e49c228 100644 --- a/chrome/installer/util/self_cleaning_temp_dir_unittest.cc +++ b/chrome/installer/util/self_cleaning_temp_dir_unittest.cc @@ -6,7 +6,7 @@ #include <wincrypt.h> #include "base/file_util.h" -#include "base/scoped_temp_dir.h" +#include "base/files/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/installer/util/self_cleaning_temp_dir.h" @@ -66,7 +66,7 @@ TEST_F(SelfCleaningTempDirTest, TopLevelPlusOne) { // Delete() is called. TEST_F(SelfCleaningTempDirTest, RemoveUnusedOnDelete) { // Make a directory in which we'll work. - ScopedTempDir work_dir; + base::ScopedTempDir work_dir; EXPECT_TRUE(work_dir.CreateUniqueTempDir()); // Make up some path under the temp dir. @@ -87,7 +87,7 @@ TEST_F(SelfCleaningTempDirTest, RemoveUnusedOnDelete) { // Test that two clients can work in the same area. TEST_F(SelfCleaningTempDirTest, TwoClients) { // Make a directory in which we'll work. - ScopedTempDir work_dir; + base::ScopedTempDir work_dir; EXPECT_TRUE(work_dir.CreateUniqueTempDir()); // Make up some path under the temp dir. @@ -124,7 +124,7 @@ TEST_F(SelfCleaningTempDirTest, TwoClients) { // destructor is called. TEST_F(SelfCleaningTempDirTest, RemoveUnusedOnDestroy) { // Make a directory in which we'll work. - ScopedTempDir work_dir; + base::ScopedTempDir work_dir; EXPECT_TRUE(work_dir.CreateUniqueTempDir()); // Make up some path under the temp dir. @@ -149,7 +149,7 @@ TEST_F(SelfCleaningTempDirTest, LeaveUsedOnDestroy) { static const char kHiHon[] = "hi, hon"; // Make a directory in which we'll work. - ScopedTempDir work_dir; + base::ScopedTempDir work_dir; EXPECT_TRUE(work_dir.CreateUniqueTempDir()); // Make up some path under the temp dir. diff --git a/chrome/installer/util/shell_util_unittest.cc b/chrome/installer/util/shell_util_unittest.cc index eec57cc..fa6b8b9 100644 --- a/chrome/installer/util/shell_util_unittest.cc +++ b/chrome/installer/util/shell_util_unittest.cc @@ -9,11 +9,11 @@ #include "base/base_paths.h" #include "base/base_paths_win.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/md5.h" -#include "base/scoped_temp_dir.h" +#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/memory/scoped_ptr.h" #include "base/test/scoped_path_override.h" #include "base/test/test_shortcut_win.h" #include "base/win/shortcut.h" @@ -156,13 +156,13 @@ class ShellUtilShortcutTest : public testing::Test { // A ShellUtil::ShortcutProperties object with common properties set already. scoped_ptr<ShellUtil::ShortcutProperties> test_properties_; - ScopedTempDir temp_dir_; - ScopedTempDir fake_user_desktop_; - ScopedTempDir fake_common_desktop_; - ScopedTempDir fake_user_quick_launch_; - ScopedTempDir fake_default_user_quick_launch_; - ScopedTempDir fake_start_menu_; - ScopedTempDir fake_common_start_menu_; + base::ScopedTempDir temp_dir_; + base::ScopedTempDir fake_user_desktop_; + base::ScopedTempDir fake_common_desktop_; + base::ScopedTempDir fake_user_quick_launch_; + base::ScopedTempDir fake_default_user_quick_launch_; + base::ScopedTempDir fake_start_menu_; + base::ScopedTempDir fake_common_start_menu_; scoped_ptr<base::ScopedPathOverride> user_desktop_override_; scoped_ptr<base::ScopedPathOverride> common_desktop_override_; scoped_ptr<base::ScopedPathOverride> user_quick_launch_override_; @@ -428,7 +428,7 @@ TEST_F(ShellUtilShortcutTest, CreateMultipleStartMenuShortcutsAndRemoveFolder) { } TEST_F(ShellUtilShortcutTest, DontRemoveChromeShortcutIfPointsToAnotherChrome) { - ScopedTempDir other_exe_dir; + base::ScopedTempDir other_exe_dir; ASSERT_TRUE(other_exe_dir.CreateUniqueTempDir()); FilePath other_chrome_exe = other_exe_dir.path().Append(installer::kChromeExe); diff --git a/chrome/installer/util/work_item_list_unittest.cc b/chrome/installer/util/work_item_list_unittest.cc index 71c75f2..36f2f9e 100644 --- a/chrome/installer/util/work_item_list_unittest.cc +++ b/chrome/installer/util/work_item_list_unittest.cc @@ -6,9 +6,9 @@ #include "base/base_paths.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/win/registry.h" #include "chrome/installer/util/conditional_work_item_list.h" @@ -45,7 +45,7 @@ class WorkItemListTest : public testing::Test { ASSERT_EQ(ERROR_SUCCESS, key.DeleteKey(kTestRoot)); } - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; }; } // namespace |