diff options
Diffstat (limited to 'chrome/installer/util')
33 files changed, 38 insertions, 38 deletions
diff --git a/chrome/installer/util/auto_launch_util.cc b/chrome/installer/util/auto_launch_util.cc index 4e2d292..60ef370 100644 --- a/chrome/installer/util/auto_launch_util.cc +++ b/chrome/installer/util/auto_launch_util.cc @@ -5,7 +5,7 @@ #include "chrome/installer/util/auto_launch_util.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc index aa53f97..bde7d20a 100644 --- a/chrome/installer/util/browser_distribution.cc +++ b/chrome/installer/util/browser_distribution.cc @@ -11,9 +11,9 @@ #include "base/atomicops.h" #include "base/command_line.h" -#include "base/file_path.h" -#include "base/path_service.h" +#include "base/files/file_path.h" #include "base/logging.h" +#include "base/path_service.h" #include "base/win/registry.h" #include "base/win/windows_version.h" #include "chrome/common/env_vars.h" diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h index ff4890a..025a708 100644 --- a/chrome/installer/util/browser_distribution.h +++ b/chrome/installer/util/browser_distribution.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "base/version.h" #include "chrome/installer/util/util_constants.h" diff --git a/chrome/installer/util/chrome_app_host_operations.cc b/chrome/installer/util/chrome_app_host_operations.cc index 0597a38..caa7d7e 100644 --- a/chrome/installer/util/chrome_app_host_operations.cc +++ b/chrome/installer/util/chrome_app_host_operations.cc @@ -5,7 +5,7 @@ #include "chrome/installer/util/chrome_app_host_operations.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "chrome/common/chrome_switches.h" #include "chrome/installer/util/browser_distribution.h" diff --git a/chrome/installer/util/chrome_binaries_operations.cc b/chrome/installer/util/chrome_binaries_operations.cc index d4f5d8b..9a00805 100644 --- a/chrome/installer/util/chrome_binaries_operations.cc +++ b/chrome/installer/util/chrome_binaries_operations.cc @@ -5,7 +5,7 @@ #include "chrome/installer/util/chrome_binaries_operations.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "chrome/installer/util/channel_info.h" #include "chrome/installer/util/helper.h" diff --git a/chrome/installer/util/chrome_browser_operations.cc b/chrome/installer/util/chrome_browser_operations.cc index ed77f57..1f23261 100644 --- a/chrome/installer/util/chrome_browser_operations.cc +++ b/chrome/installer/util/chrome_browser_operations.cc @@ -5,8 +5,8 @@ #include "chrome/installer/util/chrome_browser_operations.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "chrome/installer/util/browser_distribution.h" diff --git a/chrome/installer/util/chrome_frame_operations.cc b/chrome/installer/util/chrome_frame_operations.cc index 7f47288..5783da9 100644 --- a/chrome/installer/util/chrome_frame_operations.cc +++ b/chrome/installer/util/chrome_frame_operations.cc @@ -5,7 +5,7 @@ #include "chrome/installer/util/chrome_frame_operations.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "chrome/installer/util/channel_info.h" #include "chrome/installer/util/helper.h" diff --git a/chrome/installer/util/conditional_work_item_list.h b/chrome/installer/util/conditional_work_item_list.h index 1358f82..1e90a78 100644 --- a/chrome/installer/util/conditional_work_item_list.h +++ b/chrome/installer/util/conditional_work_item_list.h @@ -7,7 +7,7 @@ #include "chrome/installer/util/work_item_list.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" // A WorkItemList subclass that permits conditionally executing a set of diff --git a/chrome/installer/util/copy_tree_work_item.h b/chrome/installer/util/copy_tree_work_item.h index d79e618..af01cf5 100644 --- a/chrome/installer/util/copy_tree_work_item.h +++ b/chrome/installer/util/copy_tree_work_item.h @@ -5,7 +5,7 @@ #ifndef CHROME_INSTALLER_UTIL_COPY_TREE_WORK_ITEM_H_ #define CHROME_INSTALLER_UTIL_COPY_TREE_WORK_ITEM_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/gtest_prod_util.h" #include "chrome/installer/util/work_item.h" diff --git a/chrome/installer/util/create_dir_work_item.h b/chrome/installer/util/create_dir_work_item.h index ef344be9..83d3d05 100644 --- a/chrome/installer/util/create_dir_work_item.h +++ b/chrome/installer/util/create_dir_work_item.h @@ -7,7 +7,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/installer/util/work_item.h" // A WorkItem subclass that creates a directory with the specified path. diff --git a/chrome/installer/util/delete_reg_value_work_item_unittest.cc b/chrome/installer/util/delete_reg_value_work_item_unittest.cc index 29181aa..35d11a2 100644 --- a/chrome/installer/util/delete_reg_value_work_item_unittest.cc +++ b/chrome/installer/util/delete_reg_value_work_item_unittest.cc @@ -4,7 +4,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/win/registry.h" diff --git a/chrome/installer/util/delete_tree_work_item.h b/chrome/installer/util/delete_tree_work_item.h index 0de100b..3907ac2 100644 --- a/chrome/installer/util/delete_tree_work_item.h +++ b/chrome/installer/util/delete_tree_work_item.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "chrome/installer/util/work_item.h" diff --git a/chrome/installer/util/fake_installation_state.h b/chrome/installer/util/fake_installation_state.h index b10814e..c81cc5b 100644 --- a/chrome/installer/util/fake_installation_state.h +++ b/chrome/installer/util/fake_installation_state.h @@ -5,7 +5,7 @@ #ifndef CHROME_INSTALLER_UTIL_FAKE_INSTALLATION_STATE_H_ #define CHROME_INSTALLER_UTIL_FAKE_INSTALLATION_STATE_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/version.h" #include "chrome/installer/util/fake_product_state.h" #include "chrome/installer/util/helper.h" diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index 925e876..508ce8d 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -14,7 +14,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/installer/util/google_chrome_distribution_dummy.cc b/chrome/installer/util/google_chrome_distribution_dummy.cc index 1d75ea2..5ac90f7 100644 --- a/chrome/installer/util/google_chrome_distribution_dummy.cc +++ b/chrome/installer/util/google_chrome_distribution_dummy.cc @@ -12,7 +12,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/values.h" diff --git a/chrome/installer/util/google_update_util.cc b/chrome/installer/util/google_update_util.cc index 1d39d67..5219ac8 100644 --- a/chrome/installer/util/google_update_util.cc +++ b/chrome/installer/util/google_update_util.cc @@ -11,8 +11,8 @@ #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/process_util.h" #include "base/string16.h" diff --git a/chrome/installer/util/helper.cc b/chrome/installer/util/helper.cc index 52580a4..bb0f22e 100644 --- a/chrome/installer/util/helper.cc +++ b/chrome/installer/util/helper.cc @@ -4,14 +4,14 @@ #include "chrome/installer/util/helper.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/file_path.h" #include "base/path_service.h" #include "base/win/windows_version.h" #include "chrome/common/chrome_constants.h" #include "chrome/installer/util/browser_distribution.h" -#include "chrome/installer/util/installation_state.h" #include "chrome/installer/util/install_util.h" +#include "chrome/installer/util/installation_state.h" #include "chrome/installer/util/util_constants.h" namespace { diff --git a/chrome/installer/util/install_util.h b/chrome/installer/util/install_util.h index 2d161e5..55071fc 100644 --- a/chrome/installer/util/install_util.h +++ b/chrome/installer/util/install_util.h @@ -9,12 +9,12 @@ #ifndef CHROME_INSTALLER_UTIL_INSTALL_UTIL_H_ #define CHROME_INSTALLER_UTIL_INSTALL_UTIL_H_ -#include <tchar.h> #include <windows.h> +#include <tchar.h> #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "base/win/scoped_handle.h" #include "chrome/installer/util/browser_distribution.h" diff --git a/chrome/installer/util/installation_state.h b/chrome/installer/util/installation_state.h index 76ebef9..30097d5 100644 --- a/chrome/installer/util/installation_state.h +++ b/chrome/installer/util/installation_state.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/installer/util/app_commands.h" #include "chrome/installer/util/browser_distribution.h" diff --git a/chrome/installer/util/installation_validator_unittest.cc b/chrome/installer/util/installation_validator_unittest.cc index 9e1ff90..16a2e2b 100644 --- a/chrome/installer/util/installation_validator_unittest.cc +++ b/chrome/installer/util/installation_validator_unittest.cc @@ -5,7 +5,7 @@ #include <map> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/version.h" diff --git a/chrome/installer/util/installer_state.h b/chrome/installer/util/installer_state.h index 93ba4a0..47df2b4 100644 --- a/chrome/installer/util/installer_state.h +++ b/chrome/installer/util/installer_state.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/chrome/installer/util/installer_state_unittest.cc b/chrome/installer/util/installer_state_unittest.cc index a67f2a08..5395a84 100644 --- a/chrome/installer/util/installer_state_unittest.cc +++ b/chrome/installer/util/installer_state_unittest.cc @@ -8,8 +8,8 @@ #include "base/base_paths.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/process_util.h" diff --git a/chrome/installer/util/installer_util_test_common.cc b/chrome/installer/util/installer_util_test_common.cc index 716b9df..005a160 100644 --- a/chrome/installer/util/installer_util_test_common.cc +++ b/chrome/installer/util/installer_util_test_common.cc @@ -7,7 +7,7 @@ #include <windows.h> #include <shellapi.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" namespace installer { diff --git a/chrome/installer/util/logging_installer.cc b/chrome/installer/util/logging_installer.cc index f11ec13..adc7801 100644 --- a/chrome/installer/util/logging_installer.cc +++ b/chrome/installer/util/logging_installer.cc @@ -7,8 +7,8 @@ #include "chrome/installer/util/logging_installer.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/logging_win.h" #include "base/path_service.h" diff --git a/chrome/installer/util/logging_installer_unittest.cc b/chrome/installer/util/logging_installer_unittest.cc index 9a9fdb9..722897e 100644 --- a/chrome/installer/util/logging_installer_unittest.cc +++ b/chrome/installer/util/logging_installer_unittest.cc @@ -4,8 +4,8 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/platform_file.h" #include "base/win/scoped_handle.h" diff --git a/chrome/installer/util/move_tree_work_item.h b/chrome/installer/util/move_tree_work_item.h index cd8c513..371182d 100644 --- a/chrome/installer/util/move_tree_work_item.h +++ b/chrome/installer/util/move_tree_work_item.h @@ -5,7 +5,7 @@ #ifndef CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_ #define CHROME_INSTALLER_UTIL_MOVE_TREE_WORK_ITEM_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/gtest_prod_util.h" #include "chrome/installer/util/work_item.h" diff --git a/chrome/installer/util/product_operations.h b/chrome/installer/util/product_operations.h index 7531d69..77d094b 100644 --- a/chrome/installer/util/product_operations.h +++ b/chrome/installer/util/product_operations.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/installer/util/shell_util.h" class BrowserDistribution; diff --git a/chrome/installer/util/product_unittest.h b/chrome/installer/util/product_unittest.h index 05c903c..a8e9afb 100644 --- a/chrome/installer/util/product_unittest.h +++ b/chrome/installer/util/product_unittest.h @@ -7,8 +7,8 @@ #include <windows.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/installer/util/self_cleaning_temp_dir.h b/chrome/installer/util/self_cleaning_temp_dir.h index c2fb972..e473aec 100644 --- a/chrome/installer/util/self_cleaning_temp_dir.h +++ b/chrome/installer/util/self_cleaning_temp_dir.h @@ -6,7 +6,7 @@ #define CHROME_INSTALLER_UTIL_SELF_CLEANING_TEMP_DIR_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" namespace installer { diff --git a/chrome/installer/util/set_reg_value_work_item_unittest.cc b/chrome/installer/util/set_reg_value_work_item_unittest.cc index 4d6bb3d..c1a4bce 100644 --- a/chrome/installer/util/set_reg_value_work_item_unittest.cc +++ b/chrome/installer/util/set_reg_value_work_item_unittest.cc @@ -4,7 +4,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/win/registry.h" diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index b60176d..0bc6353 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -16,8 +16,8 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/md5.h" diff --git a/chrome/installer/util/shell_util.h b/chrome/installer/util/shell_util.h index 726d0c5..bfdb9b9 100644 --- a/chrome/installer/util/shell_util.h +++ b/chrome/installer/util/shell_util.h @@ -15,7 +15,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string16.h" #include "chrome/installer/util/work_item_list.h" diff --git a/chrome/installer/util/work_item_list.cc b/chrome/installer/util/work_item_list.cc index 6eaa4df..fd00773 100644 --- a/chrome/installer/util/work_item_list.cc +++ b/chrome/installer/util/work_item_list.cc @@ -4,17 +4,17 @@ #include "chrome/installer/util/work_item_list.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/file_path.h" -#include "chrome/installer/util/logging_installer.h" #include "chrome/installer/util/callback_work_item.h" #include "chrome/installer/util/copy_reg_key_work_item.h" #include "chrome/installer/util/copy_tree_work_item.h" #include "chrome/installer/util/create_dir_work_item.h" #include "chrome/installer/util/create_reg_key_work_item.h" -#include "chrome/installer/util/delete_tree_work_item.h" #include "chrome/installer/util/delete_reg_key_work_item.h" #include "chrome/installer/util/delete_reg_value_work_item.h" +#include "chrome/installer/util/delete_tree_work_item.h" +#include "chrome/installer/util/logging_installer.h" #include "chrome/installer/util/move_tree_work_item.h" #include "chrome/installer/util/self_reg_work_item.h" #include "chrome/installer/util/set_reg_value_work_item.h" |