diff options
Diffstat (limited to 'chrome/installer/setup')
-rw-r--r-- | chrome/installer/setup/archive_patch_helper.cc | 2 | ||||
-rw-r--r-- | chrome/installer/setup/archive_patch_helper_unittest.cc | 2 | ||||
-rw-r--r-- | chrome/installer/setup/install.cc | 2 | ||||
-rw-r--r-- | chrome/installer/setup/install_unittest.cc | 2 | ||||
-rw-r--r-- | chrome/installer/setup/install_worker.cc | 2 | ||||
-rw-r--r-- | chrome/installer/setup/setup_main.cc | 2 | ||||
-rw-r--r-- | chrome/installer/setup/setup_util.cc | 2 | ||||
-rw-r--r-- | chrome/installer/setup/setup_util_unittest.cc | 4 | ||||
-rw-r--r-- | chrome/installer/setup/uninstall.cc | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/chrome/installer/setup/archive_patch_helper.cc b/chrome/installer/setup/archive_patch_helper.cc index 4ef6bc4..959be3a 100644 --- a/chrome/installer/setup/archive_patch_helper.cc +++ b/chrome/installer/setup/archive_patch_helper.cc @@ -4,7 +4,7 @@ #include "chrome/installer/setup/archive_patch_helper.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "chrome/installer/util/lzma_util.h" #include "courgette/courgette.h" diff --git a/chrome/installer/setup/archive_patch_helper_unittest.cc b/chrome/installer/setup/archive_patch_helper_unittest.cc index 17ff003..9dd4f08 100644 --- a/chrome/installer/setup/archive_patch_helper_unittest.cc +++ b/chrome/installer/setup/archive_patch_helper_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index f1ab38d..a1bbed7 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -10,8 +10,8 @@ #include <string> -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/numerics/safe_conversions.h" diff --git a/chrome/installer/setup/install_unittest.cc b/chrome/installer/setup/install_unittest.cc index 54b3629..e617a19 100644 --- a/chrome/installer/setup/install_unittest.cc +++ b/chrome/installer/setup/install_unittest.cc @@ -6,8 +6,8 @@ #include <string> -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc index 727d4fe..d336630 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc @@ -15,8 +15,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index eda79e5..b02be69 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -14,9 +14,9 @@ #include "base/at_exit.h" #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/file_version_info.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc index 3f9c937..3a7bde7 100644 --- a/chrome/installer/setup/setup_util.cc +++ b/chrome/installer/setup/setup_util.cc @@ -10,9 +10,9 @@ #include "base/command_line.h" #include "base/cpu.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/process/kill.h" #include "base/process/launch.h" diff --git a/chrome/installer/setup/setup_util_unittest.cc b/chrome/installer/setup/setup_util_unittest.cc index 7f58d89..345441b8 100644 --- a/chrome/installer/setup/setup_util_unittest.cc +++ b/chrome/installer/setup/setup_util_unittest.cc @@ -9,7 +9,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/process/kill.h" @@ -21,8 +21,8 @@ #include "base/version.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" -#include "chrome/installer/setup/setup_util.h" #include "chrome/installer/setup/setup_constants.h" +#include "chrome/installer/setup/setup_util.h" #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/installation_state.h" #include "chrome/installer/util/installer_state.h" diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc index ce02a20..c06a2fc 100644 --- a/chrome/installer/setup/uninstall.cc +++ b/chrome/installer/setup/uninstall.cc @@ -11,8 +11,8 @@ #include <vector> #include "base/base_paths.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/process/kill.h" #include "base/strings/string16.h" |