diff options
Diffstat (limited to 'chrome/installer/util')
13 files changed, 15 insertions, 15 deletions
diff --git a/chrome/installer/util/copy_tree_work_item.h b/chrome/installer/util/copy_tree_work_item.h index 415d073..845d882 100644 --- a/chrome/installer/util/copy_tree_work_item.h +++ b/chrome/installer/util/copy_tree_work_item.h @@ -8,7 +8,7 @@ #include "base/file_path.h" #include "base/gtest_prod_util.h" -#include "base/memory/scoped_temp_dir.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 diff --git a/chrome/installer/util/copy_tree_work_item_unittest.cc b/chrome/installer/util/copy_tree_work_item_unittest.cc index 8660c74..f16f506 100644 --- a/chrome/installer/util/copy_tree_work_item_unittest.cc +++ b/chrome/installer/util/copy_tree_work_item_unittest.cc @@ -10,13 +10,13 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/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/threading/platform_thread.h" -#include "chrome/installer/util/work_item.h" #include "chrome/installer/util/copy_tree_work_item.h" +#include "chrome/installer/util/work_item.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/installer/util/create_dir_work_item_unittest.cc b/chrome/installer/util/create_dir_work_item_unittest.cc index e929600..6d97bbe 100644 --- a/chrome/installer/util/create_dir_work_item_unittest.cc +++ b/chrome/installer/util/create_dir_work_item_unittest.cc @@ -7,11 +7,11 @@ #include "base/base_paths.h" #include "base/file_util.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" -#include "chrome/installer/util/work_item.h" #include "chrome/installer/util/create_dir_work_item.h" +#include "chrome/installer/util/work_item.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/installer/util/delete_tree_work_item.h b/chrome/installer/util/delete_tree_work_item.h index 5e90663..ab604cc 100644 --- a/chrome/installer/util/delete_tree_work_item.h +++ b/chrome/installer/util/delete_tree_work_item.h @@ -10,7 +10,7 @@ #include "base/file_path.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.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 diff --git a/chrome/installer/util/delete_tree_work_item_unittest.cc b/chrome/installer/util/delete_tree_work_item_unittest.cc index b22ba81..239e098 100644 --- a/chrome/installer/util/delete_tree_work_item_unittest.cc +++ b/chrome/installer/util/delete_tree_work_item_unittest.cc @@ -10,9 +10,9 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/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 "chrome/installer/util/delete_tree_work_item.h" #include "chrome/installer/util/work_item.h" diff --git a/chrome/installer/util/duplicate_tree_detector_unittest.cc b/chrome/installer/util/duplicate_tree_detector_unittest.cc index 6a168e6..3c0d623 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/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "chrome/installer/util/duplicate_tree_detector.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/installer/util/installer_state_unittest.cc b/chrome/installer/util/installer_state_unittest.cc index ba74c9e..c35fac4 100644 --- a/chrome/installer/util/installer_state_unittest.cc +++ b/chrome/installer/util/installer_state_unittest.cc @@ -9,9 +9,9 @@ #include "base/base_paths.h" #include "base/command_line.h" #include "base/file_util.h" -#include "base/memory/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/utf_string_conversions.h" #include "base/version.h" diff --git a/chrome/installer/util/lzma_util_unittest.cc b/chrome/installer/util/lzma_util_unittest.cc index e82d8bf..06a8dfd 100644 --- a/chrome/installer/util/lzma_util_unittest.cc +++ b/chrome/installer/util/lzma_util_unittest.cc @@ -7,7 +7,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/memory/scoped_temp_dir.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" diff --git a/chrome/installer/util/move_tree_work_item.h b/chrome/installer/util/move_tree_work_item.h index 16fec6e..c2eeb33 100644 --- a/chrome/installer/util/move_tree_work_item.h +++ b/chrome/installer/util/move_tree_work_item.h @@ -8,7 +8,7 @@ #include "base/file_path.h" #include "base/gtest_prod_util.h" -#include "base/memory/scoped_temp_dir.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 diff --git a/chrome/installer/util/product_unittest.h b/chrome/installer/util/product_unittest.h index 3419c7d..8635fc8 100644 --- a/chrome/installer/util/product_unittest.h +++ b/chrome/installer/util/product_unittest.h @@ -10,8 +10,8 @@ #include "base/file_path.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/win/registry.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/installer/util/self_cleaning_temp_dir_unittest.cc b/chrome/installer/util/self_cleaning_temp_dir_unittest.cc index 935434c..5980575 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/memory/scoped_temp_dir.h" +#include "base/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" diff --git a/chrome/installer/util/shell_util_unittest.cc b/chrome/installer/util/shell_util_unittest.cc index 7839f2b..f6d3dd1 100644 --- a/chrome/installer/util/shell_util_unittest.cc +++ b/chrome/installer/util/shell_util_unittest.cc @@ -10,7 +10,7 @@ #include "base/file_util.h" #include "base/path_service.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "base/win/scoped_comptr.h" #include "base/win/windows_version.h" #include "chrome/installer/util/browser_distribution.h" diff --git a/chrome/installer/util/work_item_list_unittest.cc b/chrome/installer/util/work_item_list_unittest.cc index 56d3a8b8..bee5a05 100644 --- a/chrome/installer/util/work_item_list_unittest.cc +++ b/chrome/installer/util/work_item_list_unittest.cc @@ -7,8 +7,8 @@ #include "base/base_paths.h" #include "base/file_util.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_temp_dir.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" |