diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 05:40:52 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 05:40:52 +0000 |
| commit | 57999817d30c384de8974a2c64c0356e71fde63c (patch) | |
| tree | eea7cbd7cd2a1226d4d7e0b983d01268334dc2ba /chrome | |
| parent | 8701de1793a2c3fdf0f596aee8ec93c61c00bf2e (diff) | |
| download | chromium_src-57999817d30c384de8974a2c64c0356e71fde63c.zip chromium_src-57999817d30c384de8974a2c64c0356e71fde63c.tar.gz chromium_src-57999817d30c384de8974a2c64c0356e71fde63c.tar.bz2 | |
Move file_path.h to base/files.
TBR=sky
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
634 files changed, 687 insertions, 687 deletions
diff --git a/chrome/app/app_mode_loader_mac.mm b/chrome/app/app_mode_loader_mac.mm index ebcc842..56f99ca 100644 --- a/chrome/app/app_mode_loader_mac.mm +++ b/chrome/app/app_mode_loader_mac.mm @@ -13,8 +13,8 @@ #include <CoreFoundation/CoreFoundation.h> #import <Foundation/Foundation.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_nsautorelease_pool.h" diff --git a/chrome/app/breakpad_linux.cc b/chrome/app/breakpad_linux.cc index 374b929..d507095 100644 --- a/chrome/app/breakpad_linux.cc +++ b/chrome/app/breakpad_linux.cc @@ -15,8 +15,8 @@ #include <sys/socket.h> #include <sys/time.h> #include <sys/types.h> -#include <sys/wait.h> #include <sys/uio.h> +#include <sys/wait.h> #include <time.h> #include <unistd.h> @@ -24,7 +24,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/linux_util.h" #include "base/path_service.h" #include "base/platform_file.h" diff --git a/chrome/app/breakpad_mac.mm b/chrome/app/breakpad_mac.mm index 3ab6da3..e7f8ae3 100644 --- a/chrome/app/breakpad_mac.mm +++ b/chrome/app/breakpad_mac.mm @@ -12,8 +12,8 @@ #import "base/basictypes.h" #include "base/command_line.h" #include "base/debug/crash_logging.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #import "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" diff --git a/chrome/app/chrome_main_app_mode_mac.mm b/chrome/app/chrome_main_app_mode_mac.mm index 99d0dcc..d102fc8 100644 --- a/chrome/app/chrome_main_app_mode_mac.mm +++ b/chrome/app/chrome_main_app_mode_mac.mm @@ -8,7 +8,7 @@ // those app bundles. #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" diff --git a/chrome/app/chrome_main_mac.mm b/chrome/app/chrome_main_mac.mm index 6fd8783..662c93f 100644 --- a/chrome/app/chrome_main_mac.mm +++ b/chrome/app/chrome_main_mac.mm @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #import "base/mac/bundle_locations.h" #import "base/mac/foundation_util.h" diff --git a/chrome/app/nacl_fork_delegate_linux.cc b/chrome/app/nacl_fork_delegate_linux.cc index 2cb0fef..c16603d 100644 --- a/chrome/app/nacl_fork_delegate_linux.cc +++ b/chrome/app/nacl_fork_delegate_linux.cc @@ -13,7 +13,7 @@ #include "base/basictypes.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/posix/eintr_wrapper.h" diff --git a/chrome/browser/android/crash_dump_manager.h b/chrome/browser/android/crash_dump_manager.h index 6cfe497..7cf52d8 100644 --- a/chrome/browser/android/crash_dump_manager.h +++ b/chrome/browser/android/crash_dump_manager.h @@ -7,7 +7,7 @@ #include <map> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/platform_file.h" #include "base/process.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 93d0d41..8b78e26 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -7,7 +7,7 @@ #include "base/auto_reset.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" #include "base/message_loop.h" diff --git a/chrome/browser/auto_launch_trial.cc b/chrome/browser/auto_launch_trial.cc index 137b012..5339314 100644 --- a/chrome/browser/auto_launch_trial.cc +++ b/chrome/browser/auto_launch_trial.cc @@ -4,13 +4,13 @@ #include "chrome/browser/auto_launch_trial.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/string_util.h" #include "chrome/browser/first_run/first_run.h" -#include "chrome/installer/util/master_preferences_constants.h" #include "chrome/installer/util/master_preferences.h" +#include "chrome/installer/util/master_preferences_constants.h" const char kAutoLaunchTrialName[] = "AutoLaunchExperiment"; const char kAutoLaunchTrialAutoLaunchGroup[] = "AutoLaunching"; diff --git a/chrome/browser/autofill/autofill_merge_unittest.cc b/chrome/browser/autofill/autofill_merge_unittest.cc index ca90c89..3c6a184 100644 --- a/chrome/browser/autofill/autofill_merge_unittest.cc +++ b/chrome/browser/autofill/autofill_merge_unittest.cc @@ -5,7 +5,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_common_test.h" diff --git a/chrome/browser/autofill/data_driven_test.h b/chrome/browser/autofill/data_driven_test.h index 23f0483..ec6e9ac 100644 --- a/chrome/browser/autofill/data_driven_test.h +++ b/chrome/browser/autofill/data_driven_test.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" // A convenience class for implementing data-driven tests. Subclassers need only diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc index 438b0fb..6751675 100644 --- a/chrome/browser/autofill/form_structure_browsertest.cc +++ b/chrome/browser/autofill/form_structure_browsertest.cc @@ -4,7 +4,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_manager.h" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 2a8e07e..08a7cc7 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -10,7 +10,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/debug/trace_event.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" #include "base/json/json_writer.h" diff --git a/chrome/browser/automation/automation_tab_helper_browsertest.cc b/chrome/browser/automation/automation_tab_helper_browsertest.cc index 2125b9e..ec27758 100644 --- a/chrome/browser/automation/automation_tab_helper_browsertest.cc +++ b/chrome/browser/automation/automation_tab_helper_browsertest.cc @@ -4,7 +4,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string16.h" #include "base/stringprintf.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 51edc54..b1af9f2 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/json/string_escape.h" diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc index 6718908..278c2d2 100644 --- a/chrome/browser/background/background_application_list_model_unittest.cc +++ b/chrome/browser/background/background_application_list_model_unittest.cc @@ -10,8 +10,8 @@ #include "chrome/browser/background/background_application_list_model.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/stl_util.h" diff --git a/chrome/browser/background/background_mode_manager_gtk.cc b/chrome/browser/background/background_mode_manager_gtk.cc index c61a302..8dd75f3 100644 --- a/chrome/browser/background/background_mode_manager_gtk.cc +++ b/chrome/browser/background/background_mode_manager_gtk.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #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/nix/xdg_util.h" #include "chrome/browser/background/background_mode_manager.h" diff --git a/chrome/browser/background/background_mode_manager_win.cc b/chrome/browser/background/background_mode_manager_win.cc index 6c4eabf..9ce190e 100644 --- a/chrome/browser/background/background_mode_manager_win.cc +++ b/chrome/browser/background/background_mode_manager_win.cc @@ -5,7 +5,7 @@ #include "base/base_paths.h" #include "base/bind.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/utf_string_conversions.h" diff --git a/chrome/browser/bookmarks/bookmark_codec_unittest.cc b/chrome/browser/bookmarks/bookmark_codec_unittest.cc index 7ae6cab..c3fded1 100644 --- a/chrome/browser/bookmarks/bookmark_codec_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_codec_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_path.h" #include "base/file_util.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/browser/bookmarks/bookmark_html_writer.h b/chrome/browser/bookmarks/bookmark_html_writer.h index 47d004e..5f588ae 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.h +++ b/chrome/browser/bookmarks/bookmark_html_writer.h @@ -9,7 +9,7 @@ #include <map> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" #include "chrome/common/cancelable_task_tracker.h" diff --git a/chrome/browser/bookmarks/bookmark_node_data.h b/chrome/browser/bookmarks/bookmark_node_data.h index 8bf61a62..690f6c3 100644 --- a/chrome/browser/bookmarks/bookmark_node_data.h +++ b/chrome/browser/bookmarks/bookmark_node_data.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm index c32ee8e..faabc7f 100644 --- a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm +++ b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm @@ -6,7 +6,7 @@ #import <Cocoa/Cocoa.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc index d42a51a..2be831a 100644 --- a/chrome/browser/bookmarks/bookmark_storage.cc +++ b/chrome/browser/bookmarks/bookmark_storage.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_string_value_serializer.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 1ade098..83581a1 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -7,7 +7,7 @@ #include <utility> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/case_conversion.h" #include "base/i18n/string_search.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index cb7d186..18be43c 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/prefs/pref_registry_simple.h" diff --git a/chrome/browser/browser_util_win.cc b/chrome/browser/browser_util_win.cc index 2c32df0..4725493 100644 --- a/chrome/browser/browser_util_win.cc +++ b/chrome/browser/browser_util_win.cc @@ -10,7 +10,7 @@ #include <string> #include "base/base_paths.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" namespace browser_util { diff --git a/chrome/browser/browsing_data/browsing_data_file_system_helper.h b/chrome/browser/browsing_data/browsing_data_file_system_helper.h index 1178c63f..633661d 100644 --- a/chrome/browser/browsing_data/browsing_data_file_system_helper.h +++ b/chrome/browser/browsing_data/browsing_data_file_system_helper.h @@ -10,7 +10,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h b/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h index 35a2f1f..967c320 100644 --- a/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h +++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/time.h" diff --git a/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc index da2288f..3dc6e2a 100644 --- a/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc +++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/browsing_data/browsing_data_local_storage_helper.h b/chrome/browser/browsing_data/browsing_data_local_storage_helper.h index 78a519c..c41c7a7 100644 --- a/chrome/browser/browsing_data/browsing_data_local_storage_helper.h +++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper.h @@ -11,12 +11,12 @@ #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/time.h" -#include "content/public/browser/dom_storage_context.h" #include "chrome/common/url_constants.h" +#include "content/public/browser/dom_storage_context.h" #include "googleurl/src/gurl.h" class Profile; diff --git a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc index 3dd8319..b123b89 100644 --- a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc +++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/test/thread_test_helper.h" #include "base/threading/sequenced_worker_pool.h" diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc index 99a6a05..c3ffb2a 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc index 6301d78..277a4a1 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/platform_file.h" #include "base/prefs/testing_pref_service.h" diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index ffebe9d..179d050 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index e468913..995060b 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -16,8 +16,8 @@ #include "base/command_line.h" #include "base/cpu.h" #include "base/debug/trace_event.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/path_service.h" diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm index c953292..9130e2e 100644 --- a/chrome/browser/chrome_browser_main_mac.mm +++ b/chrome/browser/chrome_browser_main_mac.mm @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/debug/debugger.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/memory/scoped_nsobject.h" diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc index 6dfb69a..cbe174a 100644 --- a/chrome/browser/chrome_browser_main_win.cc +++ b/chrome/browser/chrome_browser_main_win.cc @@ -11,7 +11,7 @@ #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/rtl.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/chrome_to_mobile_service.h b/chrome/browser/chrome_to_mobile_service.h index 85c205b..bc29971 100644 --- a/chrome/browser/chrome_to_mobile_service.h +++ b/chrome/browser/chrome_to_mobile_service.h @@ -12,7 +12,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "base/string16.h" diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_data.h b/chrome/browser/chromeos/app_mode/kiosk_app_data.h index 5be6ff2..27e482dd 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_data.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/webstore_data_fetcher_delegate.h" diff --git a/chrome/browser/chromeos/boot_times_loader.cc b/chrome/browser/chromeos/boot_times_loader.cc index e39005e..e793013 100644 --- a/chrome/browser/chromeos/boot_times_loader.cc +++ b/chrome/browser/chromeos/boot_times_loader.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #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/location.h" #include "base/message_loop.h" diff --git a/chrome/browser/chromeos/contacts/contact_database.h b/chrome/browser/chromeos/contacts/contact_database.h index 053f8da..d4074df 100644 --- a/chrome/browser/chromeos/contacts/contact_database.h +++ b/chrome/browser/chromeos/contacts/contact_database.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/chrome/browser/chromeos/contacts/contact_database_unittest.cc b/chrome/browser/chromeos/contacts/contact_database_unittest.cc index 96e2768..c32cad0 100644 --- a/chrome/browser/chromeos/contacts/contact_database_unittest.cc +++ b/chrome/browser/chromeos/contacts/contact_database_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include "base/bind.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/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc index c666de891..38bead4 100644 --- a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc +++ b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/chromeos/contacts/gdata_contacts_service.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/stringprintf.h" #include "base/time.h" diff --git a/chrome/browser/chromeos/contacts/google_contact_store.cc b/chrome/browser/chromeos/contacts/google_contact_store.cc index ee46ac1..ba2bf9d 100644 --- a/chrome/browser/chromeos/contacts/google_contact_store.cc +++ b/chrome/browser/chromeos/contacts/google_contact_store.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/contacts/contact.pb.h" diff --git a/chrome/browser/chromeos/cros/burn_library.h b/chrome/browser/chromeos/cros/burn_library.h index 202178e..de0392e 100644 --- a/chrome/browser/chromeos/cros/burn_library.h +++ b/chrome/browser/chromeos/cros/burn_library.h @@ -8,7 +8,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" struct ImageBurnStatus { ImageBurnStatus() : amount_burnt(0), total_size(0) { diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc index f0a5b6b..ad0447d 100644 --- a/chrome/browser/chromeos/customization_document.cc +++ b/chrome/browser/chromeos/customization_document.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/prefs/pref_registry_simple.h" diff --git a/chrome/browser/chromeos/drive/drive_cache.h b/chrome/browser/chromeos/drive/drive_cache.h index d3c867c..ec8cc23 100644 --- a/chrome/browser/chromeos/drive/drive_cache.h +++ b/chrome/browser/chromeos/drive/drive_cache.h @@ -9,7 +9,7 @@ #include <vector> #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" diff --git a/chrome/browser/chromeos/drive/drive_cache_metadata.h b/chrome/browser/chromeos/drive/drive_cache_metadata.h index ec6471b..1e06866 100644 --- a/chrome/browser/chromeos/drive/drive_cache_metadata.h +++ b/chrome/browser/chromeos/drive/drive_cache_metadata.h @@ -6,11 +6,11 @@ #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_CACHE_METADATA_H_ #include <map> -#include <vector> #include <string> +#include <vector> #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/chromeos/drive/drive_feed_processor.h b/chrome/browser/chromeos/drive/drive_feed_processor.h index 54a9353..e4de483 100644 --- a/chrome/browser/chromeos/drive/drive_feed_processor.h +++ b/chrome/browser/chromeos/drive/drive_feed_processor.h @@ -10,7 +10,7 @@ #include <string> #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc index 4b376a5..8dd3ff3 100644 --- a/chrome/browser/chromeos/drive/drive_file_system_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/bind.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/json/json_file_value_serializer.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/chromeos/drive/drive_file_system_util.cc b/chrome/browser/chromeos/drive/drive_file_system_util.cc index 80f798a..5f8d19f 100644 --- a/chrome/browser/chromeos/drive/drive_file_system_util.cc +++ b/chrome/browser/chromeos/drive/drive_file_system_util.cc @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/message_loop_proxy.h" diff --git a/chrome/browser/chromeos/drive/drive_file_system_util_unittest.cc b/chrome/browser/chromeos/drive/drive_file_system_util_unittest.cc index 4c90b24..2e4922f 100644 --- a/chrome/browser/chromeos/drive/drive_file_system_util_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_file_system_util_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/drive/drive_file_system_util.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/drive_resource_metadata.h b/chrome/browser/chromeos/drive/drive_resource_metadata.h index 9cd61fa..03be130 100644 --- a/chrome/browser/chromeos/drive/drive_resource_metadata.h +++ b/chrome/browser/chromeos/drive/drive_resource_metadata.h @@ -11,7 +11,7 @@ #include <vector> #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time.h" diff --git a/chrome/browser/chromeos/drive/drive_sync_client_unittest.cc b/chrome/browser/chromeos/drive/drive_sync_client_unittest.cc index 8146089..4551e7b 100644 --- a/chrome/browser/chromeos/drive/drive_sync_client_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_sync_client_unittest.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/bind.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/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/chrome/browser/chromeos/drive/drive_webapps_registry.cc b/chrome/browser/chromeos/drive/drive_webapps_registry.cc index 0da55eb..0737eff 100644 --- a/chrome/browser/chromeos/drive/drive_webapps_registry.cc +++ b/chrome/browser/chromeos/drive/drive_webapps_registry.cc @@ -9,11 +9,11 @@ #include <utility> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "content/public/browser/browser_thread.h" #include "chrome/browser/google_apis/drive_api_parser.h" +#include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/drive_webapps_registry_unittest.cc b/chrome/browser/chromeos/drive/drive_webapps_registry_unittest.cc index 90f8604..ae6547b 100644 --- a/chrome/browser/chromeos/drive/drive_webapps_registry_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_webapps_registry_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/drive/drive_webapps_registry.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/chromeos/drive/file_change.h b/chrome/browser/chromeos/drive/file_change.h index b9880e9..0285bd9 100644 --- a/chrome/browser/chromeos/drive/file_change.h +++ b/chrome/browser/chromeos/drive/file_change.h @@ -7,7 +7,7 @@ #include <set> -#include "base/file_path.h" +#include "base/files/file_path.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation.h b/chrome/browser/chromeos/drive/file_system/create_directory_operation.h index cad884e..880ee45 100644 --- a/chrome/browser/chromeos/drive/file_system/create_directory_operation.h +++ b/chrome/browser/chromeos/drive/file_system/create_directory_operation.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_CREATE_DIRECTORY_OPERATION_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/chromeos/drive/mock_directory_change_observer.h b/chrome/browser/chromeos/drive/mock_directory_change_observer.h index 65068c5..4385d87 100644 --- a/chrome/browser/chromeos/drive/mock_directory_change_observer.h +++ b/chrome/browser/chromeos/drive/mock_directory_change_observer.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DIRECTORY_CHANGE_OBSERVER_H_ #define CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DIRECTORY_CHANGE_OBSERVER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/chromeos/drive/drive_file_system_observer.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc index aa036a2..d31db49e 100644 --- a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/values.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_test_util.h" diff --git a/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc b/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc index c2ae1b7..e9c8bcee 100644 --- a/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc +++ b/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc @@ -6,8 +6,8 @@ #include <vector> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/stringprintf.h" diff --git a/chrome/browser/chromeos/extensions/default_app_order.cc b/chrome/browser/chromeos/extensions/default_app_order.cc index d9acdc5..3f6bce4 100644 --- a/chrome/browser/chromeos/extensions/default_app_order.cc +++ b/chrome/browser/chromeos/extensions/default_app_order.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "base/time.h" diff --git a/chrome/browser/chromeos/extensions/default_app_order_unittest.cc b/chrome/browser/chromeos/extensions/default_app_order_unittest.cc index 73ada42..689b032 100644 --- a/chrome/browser/chromeos/extensions/default_app_order_unittest.cc +++ b/chrome/browser/chromeos/extensions/default_app_order_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include <vector> -#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/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc index ce0c101..9bb26fa 100644 --- a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc +++ b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/bind.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/json/json_file_value_serializer.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_handler_api.cc b/chrome/browser/chromeos/extensions/file_browser_handler_api.cc index a46ecba..a95ae51 100644 --- a/chrome/browser/chromeos/extensions/file_browser_handler_api.cc +++ b/chrome/browser/chromeos/extensions/file_browser_handler_api.cc @@ -31,8 +31,8 @@ #include "chrome/browser/chromeos/extensions/file_browser_handler_api.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_handler_api.h b/chrome/browser/chromeos/extensions/file_browser_handler_api.h index 565cf32..851ef8f 100644 --- a/chrome/browser/chromeos/extensions/file_browser_handler_api.h +++ b/chrome/browser/chromeos/extensions/file_browser_handler_api.h @@ -15,7 +15,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/extensions/extension_function.h" class Browser; diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc index 460f4da..dcff9c8 100644 --- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc +++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc @@ -12,8 +12,8 @@ #include "base/base64.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/case_conversion.h" #include "base/json/json_writer.h" #include "base/logging.h" @@ -74,6 +74,7 @@ #include "net/base/network_change_notifier.h" #include "ui/base/l10n/l10n_util.h" #include "ui/shell_dialogs/selected_file_info.h" +#include "ui/webui/web_ui_util.h" #include "webkit/chromeos/fileapi/cros_mount_point_provider.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_file_util.h" @@ -81,7 +82,6 @@ #include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_util.h" -#include "ui/webui/web_ui_util.h" using extensions::app_file_handler_util::FindFileHandlersForMimeTypes; using chromeos::disks::DiskMountManager; diff --git a/chrome/browser/chromeos/extensions/file_manager_browsertest.cc b/chrome/browser/chromeos/extensions/file_manager_browsertest.cc index 41aa6f0..5dd7024 100644 --- a/chrome/browser/chromeos/extensions/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/extensions/file_manager_browsertest.cc @@ -12,8 +12,8 @@ #include <string> #include "base/callback.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/platform_file.h" #include "base/threading/platform_thread.h" diff --git a/chrome/browser/chromeos/extensions/file_manager_util.h b/chrome/browser/chromeos/extensions/file_manager_util.h index 00743b8..52cfe30 100644 --- a/chrome/browser/chromeos/extensions/file_manager_util.h +++ b/chrome/browser/chromeos/extensions/file_manager_util.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/google_apis/operation_registry.h" #include "googleurl/src/gurl.h" #include "ui/shell_dialogs/select_file_dialog.h" diff --git a/chrome/browser/chromeos/extensions/install_limiter.h b/chrome/browser/chromeos/extensions/install_limiter.h index 9b59dd4..1a470e5 100644 --- a/chrome/browser/chromeos/extensions/install_limiter.h +++ b/chrome/browser/chromeos/extensions/install_limiter.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/timer.h" diff --git a/chrome/browser/chromeos/extensions/zip_file_creator.h b/chrome/browser/chromeos/extensions/zip_file_creator.h index d43e8d2..78b82d5 100644 --- a/chrome/browser/chromeos/extensions/zip_file_creator.h +++ b/chrome/browser/chromeos/extensions/zip_file_creator.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/platform_file.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/chromeos/external_metrics.h b/chrome/browser/chromeos/external_metrics.h index 42a1378..20e77ee 100644 --- a/chrome/browser/chromeos/external_metrics.h +++ b/chrome/browser/chromeos/external_metrics.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/hash_tables.h" #include "base/memory/ref_counted.h" diff --git a/chrome/browser/chromeos/imageburner/burn_controller.cc b/chrome/browser/chromeos/imageburner/burn_controller.cc index 4e6ec94..2b8b783 100644 --- a/chrome/browser/chromeos/imageburner/burn_controller.cc +++ b/chrome/browser/chromeos/imageburner/burn_controller.cc @@ -5,13 +5,13 @@ #include "chrome/browser/chromeos/imageburner/burn_controller.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/imageburner/burn_manager.h" -#include "grit/generated_resources.h" #include "googleurl/src/gurl.h" +#include "grit/generated_resources.h" namespace chromeos { namespace imageburner { diff --git a/chrome/browser/chromeos/imageburner/burn_manager.h b/chrome/browser/chromeos/imageburner/burn_manager.h index de0d16e..8b49675 100644 --- a/chrome/browser/chromeos/imageburner/burn_manager.h +++ b/chrome/browser/chromeos/imageburner/burn_manager.h @@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/time.h" diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h index 949247e..c964017 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h @@ -7,7 +7,7 @@ #include "ash/wm/user_activity_observer.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" namespace extensions { diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index 77976f5..47d2f31 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -11,8 +11,8 @@ #include "base/chromeos/chromeos_version.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/chromeos/login/mock_user_image_manager.h b/chrome/browser/chromeos/login/mock_user_image_manager.h index 658c53b..9ee0328 100644 --- a/chrome/browser/chromeos/login/mock_user_image_manager.h +++ b/chrome/browser/chromeos/login/mock_user_image_manager.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/chromeos/login/user_image.h" #include "chrome/browser/chromeos/login/user_image_manager.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/chromeos/login/mock_user_manager.h b/chrome/browser/chromeos/login/mock_user_manager.h index 5efb915..cde30d5 100644 --- a/chrome/browser/chromeos/login/mock_user_manager.h +++ b/chrome/browser/chromeos/login/mock_user_manager.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/login/mock_user_image_manager.h" #include "chrome/browser/chromeos/login/user.h" diff --git a/chrome/browser/chromeos/login/parallel_authenticator.cc b/chrome/browser/chromeos/login/parallel_authenticator.cc index f2ec45e..c0b1dcf 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator.cc @@ -6,8 +6,8 @@ #include "base/bind.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 "base/strings/string_number_conversions.h" diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc index 66cf692..8c69324 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc @@ -6,8 +6,8 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/string_util.h" diff --git a/chrome/browser/chromeos/login/user_image_loader.cc b/chrome/browser/chromeos/login/user_image_loader.cc index 7ba6b1a..301d712 100644 --- a/chrome/browser/chromeos/login/user_image_loader.cc +++ b/chrome/browser/chromeos/login/user_image_loader.cc @@ -5,8 +5,8 @@ #include "chrome/browser/chromeos/login/user_image_loader.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/threading/worker_pool.h" diff --git a/chrome/browser/chromeos/login/user_image_manager_impl.cc b/chrome/browser/chromeos/login/user_image_manager_impl.cc index 096b4b3..8db43bd 100644 --- a/chrome/browser/chromeos/login/user_image_manager_impl.cc +++ b/chrome/browser/chromeos/login/user_image_manager_impl.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/debug/trace_event.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc index 48e2035..acb48b3 100644 --- a/chrome/browser/chromeos/login/user_manager_impl.cc +++ b/chrome/browser/chromeos/login/user_manager_impl.cc @@ -13,8 +13,8 @@ #include "base/chromeos/chromeos_version.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/chromeos/login/wallpaper_manager.cc b/chrome/browser/chromeos/login/wallpaper_manager.cc index cb6db6d..aa549bb 100644 --- a/chrome/browser/chromeos/login/wallpaper_manager.cc +++ b/chrome/browser/chromeos/login/wallpaper_manager.cc @@ -8,8 +8,8 @@ #include "ash/shell.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/metrics/histogram.h" #include "base/path_service.h" diff --git a/chrome/browser/chromeos/login/wallpaper_manager.h b/chrome/browser/chromeos/login/wallpaper_manager.h index f9a1a34..c7b75c7 100644 --- a/chrome/browser/chromeos/login/wallpaper_manager.h +++ b/chrome/browser/chromeos/login/wallpaper_manager.h @@ -8,7 +8,7 @@ #include <string> #include "ash/desktop_background/desktop_background_controller.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" #include "base/threading/sequenced_worker_pool.h" diff --git a/chrome/browser/chromeos/mobile/mobile_activator.h b/chrome/browser/chromeos/mobile/mobile_activator.h index 5848a55..49ea96c 100644 --- a/chrome/browser/chromeos/mobile/mobile_activator.h +++ b/chrome/browser/chromeos/mobile/mobile_activator.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" diff --git a/chrome/browser/chromeos/mobile_config.cc b/chrome/browser/chromeos/mobile_config.cc index eec29c7..651068b 100644 --- a/chrome/browser/chromeos/mobile_config.cc +++ b/chrome/browser/chromeos/mobile_config.cc @@ -7,8 +7,8 @@ #include <algorithm> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/stl_util.h" diff --git a/chrome/browser/chromeos/settings/mock_owner_key_util.h b/chrome/browser/chromeos/settings/mock_owner_key_util.h index 6c63e17..b64cba0 100644 --- a/chrome/browser/chromeos/settings/mock_owner_key_util.h +++ b/chrome/browser/chromeos/settings/mock_owner_key_util.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/settings/owner_key_util.h" diff --git a/chrome/browser/chromeos/settings/owner_key_util.h b/chrome/browser/chromeos/settings/owner_key_util.h index b41dfdc..8e42a50 100644 --- a/chrome/browser/chromeos/settings/owner_key_util.h +++ b/chrome/browser/chromeos/settings/owner_key_util.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" diff --git a/chrome/browser/chromeos/settings/owner_key_util_unittest.cc b/chrome/browser/chromeos/settings/owner_key_util_unittest.cc index 9ac917c..b009c33 100644 --- a/chrome/browser/chromeos/settings/owner_key_util_unittest.cc +++ b/chrome/browser/chromeos/settings/owner_key_util_unittest.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/basictypes.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/memory/ref_counted.h" #include "base/stl_util.h" diff --git a/chrome/browser/chromeos/settings/session_manager_operation.cc b/chrome/browser/chromeos/settings/session_manager_operation.cc index 5ec4273..ecc86b1 100644 --- a/chrome/browser/chromeos/settings/session_manager_operation.cc +++ b/chrome/browser/chromeos/settings/session_manager_operation.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/stl_util.h" #include "base/task_runner_util.h" diff --git a/chrome/browser/chromeos/system/drm_settings.cc b/chrome/browser/chromeos/system/drm_settings.cc index 7bb6fd7..b56e0a3 100644 --- a/chrome/browser/chromeos/system/drm_settings.cc +++ b/chrome/browser/chromeos/system/drm_settings.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/chromeos/chromeos_version.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/chromeos/system/input_device_settings.cc b/chrome/browser/chromeos/system/input_device_settings.cc index da16565..f5a74fd 100644 --- a/chrome/browser/chromeos/system/input_device_settings.cc +++ b/chrome/browser/chromeos/system/input_device_settings.cc @@ -11,8 +11,8 @@ #include "base/bind.h" #include "base/chromeos/chromeos_version.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/process_util.h" #include "base/stringprintf.h" diff --git a/chrome/browser/chromeos/system/name_value_pairs_parser.cc b/chrome/browser/chromeos/system/name_value_pairs_parser.cc index 84928c7..4ac92e9 100644 --- a/chrome/browser/chromeos/system/name_value_pairs_parser.cc +++ b/chrome/browser/chromeos/system/name_value_pairs_parser.cc @@ -5,8 +5,8 @@ #include "chrome/browser/chromeos/system/name_value_pairs_parser.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/process_util.h" #include "base/stl_util.h" diff --git a/chrome/browser/chromeos/system/statistics_provider.cc b/chrome/browser/chromeos/system/statistics_provider.cc index c8b6d74..a8cb110 100644 --- a/chrome/browser/chromeos/system/statistics_provider.cc +++ b/chrome/browser/chromeos/system/statistics_provider.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/chromeos/chromeos_version.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/memory/singleton.h" #include "base/synchronization/waitable_event.h" diff --git a/chrome/browser/chromeos/system/syslogs_provider.cc b/chrome/browser/chromeos/system/syslogs_provider.cc index ac06731..95bfa92 100644 --- a/chrome/browser/chromeos/system/syslogs_provider.cc +++ b/chrome/browser/chromeos/system/syslogs_provider.cc @@ -10,8 +10,8 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" diff --git a/chrome/browser/chromeos/system/timezone_settings.cc b/chrome/browser/chromeos/system/timezone_settings.cc index 7cd8e95..01c4cb5 100644 --- a/chrome/browser/chromeos/system/timezone_settings.cc +++ b/chrome/browser/chromeos/system/timezone_settings.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/chromeos/chromeos_version.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" diff --git a/chrome/browser/chromeos/system_logs/command_line_log_source.cc b/chrome/browser/chromeos/system_logs/command_line_log_source.cc index 55e5548..dec7206 100644 --- a/chrome/browser/chromeos/system_logs/command_line_log_source.cc +++ b/chrome/browser/chromeos/system_logs/command_line_log_source.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/process_util.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc b/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc index 56c3496..e8fb238 100644 --- a/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc +++ b/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc @@ -8,11 +8,11 @@ #include "base/bind.h" #include "base/bind_helpers.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 "base/string_split.h" +#include "base/string_util.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/version_loader.cc b/chrome/browser/chromeos/version_loader.cc index 6334b16..56bee93 100644 --- a/chrome/browser/chromeos/version_loader.cc +++ b/chrome/browser/chromeos/version_loader.cc @@ -7,8 +7,8 @@ #include <vector> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/message_loop.h" #include "base/string_split.h" diff --git a/chrome/browser/component_updater/component_unpacker.h b/chrome/browser/component_updater/component_unpacker.h index be26517..e51555c 100644 --- a/chrome/browser/component_updater/component_unpacker.h +++ b/chrome/browser/component_updater/component_unpacker.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" class ComponentInstaller; diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc index f2d0155..44ae640 100644 --- a/chrome/browser/component_updater/component_updater_service.cc +++ b/chrome/browser/component_updater/component_updater_service.cc @@ -10,8 +10,8 @@ #include "base/at_exit.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc index 7232e45..e2c56f8 100644 --- a/chrome/browser/component_updater/pepper_flash_component_installer.cc +++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc @@ -12,8 +12,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_split.h" @@ -25,11 +25,11 @@ #include "build/build_config.h" #include "chrome/browser/component_updater/component_updater_service.h" #include "chrome/browser/plugins/plugin_prefs.h" -#include "chrome/common/pepper_flash.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pepper_flash.h" +#include "chrome/common/pepper_flash.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/plugin_service.h" #include "content/public/common/pepper_plugin_info.h" diff --git a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc index c4448e4..aa78dfd 100644 --- a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc +++ b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/chrome/browser/component_updater/recovery_component_installer.cc b/chrome/browser/component_updater/recovery_component_installer.cc index 8746743..9e779a1 100644 --- a/chrome/browser/component_updater/recovery_component_installer.cc +++ b/chrome/browser/component_updater/recovery_component_installer.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/prefs/pref_registry_simple.h" diff --git a/chrome/browser/component_updater/swiftshader_component_installer.cc b/chrome/browser/component_updater/swiftshader_component_installer.cc index 1a155ec0..f98d651 100644 --- a/chrome/browser/component_updater/swiftshader_component_installer.cc +++ b/chrome/browser/component_updater/swiftshader_component_installer.cc @@ -4,12 +4,12 @@ #include "chrome/browser/component_updater/swiftshader_component_installer.h" -#include "base/bind.h" #include "base/base_paths.h" +#include "base/bind.h" #include "base/compiler_specific.h" #include "base/cpu.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/chrome/browser/component_updater/test/component_installers_unittest.cc b/chrome/browser/component_updater/test/component_installers_unittest.cc index f0a38dc..54dcbbf 100644 --- a/chrome/browser/component_updater/test/component_installers_unittest.cc +++ b/chrome/browser/component_updater/test/component_installers_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/component_updater/flash_component_installer.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/chrome/browser/component_updater/test/component_updater_service_unittest.cc b/chrome/browser/component_updater/test/component_updater_service_unittest.cc index 5e27c7e..471c90a 100644 --- a/chrome/browser/component_updater/test/component_updater_service_unittest.cc +++ b/chrome/browser/component_updater/test/component_updater_service_unittest.cc @@ -8,8 +8,8 @@ #include <utility> #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_vector.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/crash_handler_host_linux.cc b/chrome/browser/crash_handler_host_linux.cc index d1a47b7..9298ebb 100644 --- a/chrome/browser/crash_handler_host_linux.cc +++ b/chrome/browser/crash_handler_host_linux.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/format_macros.h" #include "base/linux_util.h" #include "base/logging.h" diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc index 775af6d..373ee85 100644 --- a/chrome/browser/crash_recovery_browsertest.cc +++ b/chrome/browser/crash_recovery_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/crash_upload_list.cc b/chrome/browser/crash_upload_list.cc index 9e30367..261b01c 100644 --- a/chrome/browser/crash_upload_list.cc +++ b/chrome/browser/crash_upload_list.cc @@ -8,8 +8,8 @@ #include <iterator> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_split.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/diagnostics/diagnostics_model.cc b/chrome/browser/diagnostics/diagnostics_model.cc index e2bdc7b..2665011 100644 --- a/chrome/browser/diagnostics/diagnostics_model.cc +++ b/chrome/browser/diagnostics/diagnostics_model.cc @@ -9,11 +9,11 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" +#include "base/path_service.h" #include "base/stl_util.h" #include "base/string_util.h" -#include "base/path_service.h" #include "chrome/browser/diagnostics/diagnostics_test.h" #include "chrome/browser/diagnostics/recon_diagnostics.h" #include "chrome/browser/diagnostics/sqlite_diagnostics.h" diff --git a/chrome/browser/diagnostics/diagnostics_test.cc b/chrome/browser/diagnostics/diagnostics_test.cc index 2e46766..64d4797 100644 --- a/chrome/browser/diagnostics/diagnostics_test.cc +++ b/chrome/browser/diagnostics/diagnostics_test.cc @@ -4,7 +4,7 @@ #include "chrome/browser/diagnostics/diagnostics_test.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc index 731c68e..6ad0579 100644 --- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc +++ b/chrome/browser/download/chrome_download_manager_delegate_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_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/observer_list.h" diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 7638ec2..ac33a87 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/bind_helpers.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/memory/ref_counted.h" #include "base/path_service.h" diff --git a/chrome/browser/download/download_danger_prompt_browsertest.cc b/chrome/browser/download/download_danger_prompt_browsertest.cc index b3b5ca1..5dc13d7 100644 --- a/chrome/browser/download/download_danger_prompt_browsertest.cc +++ b/chrome/browser/download/download_danger_prompt_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/download/download_danger_prompt.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/download/download_extensions.h b/chrome/browser/download/download_extensions.h index e2ea0df..c027822 100644 --- a/chrome/browser/download/download_extensions.h +++ b/chrome/browser/download/download_extensions.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" namespace download_util { diff --git a/chrome/browser/download/download_file_icon_extractor.h b/chrome/browser/download/download_file_icon_extractor.h index 8425770..f7aa7cf 100644 --- a/chrome/browser/download/download_file_icon_extractor.h +++ b/chrome/browser/download/download_file_icon_extractor.h @@ -8,7 +8,7 @@ #include <string> #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/icon_loader.h" // Helper class for DownloadsGetFileIconFunction. Only used for a single icon diff --git a/chrome/browser/download/download_path_reservation_tracker_unittest.cc b/chrome/browser/download/download_path_reservation_tracker_unittest.cc index 452870b..6022931 100644 --- a/chrome/browser/download/download_path_reservation_tracker_unittest.cc +++ b/chrome/browser/download/download_path_reservation_tracker_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_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" diff --git a/chrome/browser/download/download_prefs.h b/chrome/browser/download/download_prefs.h index 83f1ad4c..a55e19a 100644 --- a/chrome/browser/download/download_prefs.h +++ b/chrome/browser/download/download_prefs.h @@ -7,7 +7,7 @@ #include <set> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/public/pref_member.h" class PrefRegistrySyncable; diff --git a/chrome/browser/download/download_query.cc b/chrome/browser/download/download_query.cc index b6bcc91..fd380fc 100644 --- a/chrome/browser/download/download_query.cc +++ b/chrome/browser/download/download_query.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/case_conversion.h" #include "base/i18n/string_search.h" #include "base/logging.h" diff --git a/chrome/browser/download/download_query_unittest.cc b/chrome/browser/download/download_query_unittest.cc index e45b5a9..3a178ae 100644 --- a/chrome/browser/download/download_query_unittest.cc +++ b/chrome/browser/download/download_query_unittest.cc @@ -5,7 +5,7 @@ #include <string> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" diff --git a/chrome/browser/download/download_status_updater_win.cc b/chrome/browser/download/download_status_updater_win.cc index fc96f4a..df74cea 100644 --- a/chrome/browser/download/download_status_updater_win.cc +++ b/chrome/browser/download/download_status_updater_win.cc @@ -7,7 +7,7 @@ #include <shobjidl.h> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h index e3b3cdc..941e112 100644 --- a/chrome/browser/download/download_util.h +++ b/chrome/browser/download/download_util.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/string16.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index 8070b1d..f7e73fe 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -5,8 +5,8 @@ #include "base/bind.h" #include "base/bind_helpers.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/prefs/pref_service.h" diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc index 396a772..b6818de 100644 --- a/chrome/browser/enumerate_modules_model_win.cc +++ b/chrome/browser/enumerate_modules_model_win.cc @@ -11,8 +11,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_version_info_win.h" +#include "base/files/file_path.h" #include "base/i18n/case_conversion.h" #include "base/metrics/histogram.h" #include "base/string_util.h" diff --git a/chrome/browser/extensions/activity_database.h b/chrome/browser/extensions/activity_database.h index ebc4595..fd6fd73 100644 --- a/chrome/browser/extensions/activity_database.h +++ b/chrome/browser/extensions/activity_database.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_DATABASE_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted_memory.h" #include "chrome/browser/extensions/api_actions.h" #include "chrome/browser/extensions/blocked_actions.h" diff --git a/chrome/browser/extensions/activity_database_unittest.cc b/chrome/browser/extensions/activity_database_unittest.cc index db0906a..6f1dc58 100644 --- a/chrome/browser/extensions/activity_database_unittest.cc +++ b/chrome/browser/extensions/activity_database_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #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 "chrome/browser/extensions/activity_database.h" #include "chrome/browser/extensions/api_actions.h" diff --git a/chrome/browser/extensions/api/api_resource_manager_unittest.cc b/chrome/browser/extensions/api/api_resource_manager_unittest.cc index 7e75096..8c4bbfc 100644 --- a/chrome/browser/extensions/api/api_resource_manager_unittest.cc +++ b/chrome/browser/extensions/api/api_resource_manager_unittest.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "chrome/browser/extensions/api/api_resource.h" #include "chrome/browser/extensions/api/api_resource_manager.h" #include "chrome/browser/extensions/extension_function_test_utils.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_test_util.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "content/public/browser/browser_thread.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "chrome/browser/profiles/profile.h" #include "googleurl/src/gurl.h" +#include "testing/gtest/include/gtest/gtest.h" namespace utils = extension_function_test_utils; diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index a9159ab..7b70c92 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/file_util_icu.h" #include "base/i18n/time_formatting.h" #include "base/json/json_writer.h" diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc index 1586b3b..586a22b 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc @@ -5,15 +5,15 @@ #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_vector.h" #include "base/message_loop.h" #include "base/values.h" #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h" #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h" #include "content/public/browser/resource_request_info.h" -#include "net/url_request/url_request_test_util.h" #include "net/test/test_server.h" +#include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" using base::DictionaryValue; diff --git a/chrome/browser/extensions/api/developer_private/entry_picker.cc b/chrome/browser/extensions/api/developer_private/entry_picker.cc index ed72222..2cd6bdf 100644 --- a/chrome/browser/extensions/api/developer_private/entry_picker.cc +++ b/chrome/browser/extensions/api/developer_private/entry_picker.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/api/developer_private/entry_picker.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "chrome/browser/extensions/api/developer_private/developer_private_api.h" #include "chrome/browser/extensions/shell_window_registry.h" diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/browser/extensions/api/downloads/downloads_api.h index 6efb8df..08714eb 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.h +++ b/chrome/browser/extensions/api/downloads/downloads_api.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/string16.h" #include "base/values.h" diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc index f60283e..5435410 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/api/file_system/file_system_api.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" @@ -18,21 +18,21 @@ #include "chrome/browser/ui/extensions/shell_window.h" #include "chrome/common/extensions/api/file_system.h" #include "chrome/common/extensions/permissions/api_permission.h" -#include "grit/generated_resources.h" -#include "net/base/mime_util.h" #include "content/public/browser/child_process_security_policy.h" -#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "grit/generated_resources.h" +#include "net/base/mime_util.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/shell_dialogs/select_file_dialog.h" #include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/file_system_util.h" #include "webkit/fileapi/isolated_context.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/shell_dialogs/select_file_dialog.h" #if defined(OS_MACOSX) -#include "base/mac/foundation_util.h" #include <CoreFoundation/CoreFoundation.h> +#include "base/mac/foundation_util.h" #endif using fileapi::IsolatedContext; diff --git a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc b/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc index b008b9f..dafa230 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api_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_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc index aa4da64..f4462ff 100644 --- a/chrome/browser/extensions/api/management/management_api_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.h b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.h index 88a7a8f..8058002 100644 --- a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.h +++ b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.h @@ -13,7 +13,7 @@ #include <map> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/media_gallery/media_galleries_preferences.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc index a08ada1..0c265bb 100644 --- a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc +++ b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc @@ -7,7 +7,7 @@ #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/stl_util.h" #include "base/string_number_conversions.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc index 23eb7f7..adb476a 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc @@ -4,7 +4,7 @@ // // MediaGalleriesPrivate eject API browser tests. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_apitest.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc index 996adf6..5aa0d4f 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc index d116461..c72978e 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc @@ -4,8 +4,8 @@ // // MediaGalleriesPrivate gallery watch API browser tests. -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host.cc b/chrome/browser/extensions/api/messaging/native_message_process_host.cc index bc7f725..af1be73 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/platform_file.h" #include "base/process_util.h" diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc index aa0ae5b..1a0f4d1 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc @@ -4,8 +4,8 @@ #include "base/bind.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/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/extensions/api/messaging/native_messaging_apitest_posix.cc b/chrome/browser/extensions/api/messaging/native_messaging_apitest_posix.cc index 6450b78..3649b83 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_apitest_posix.cc +++ b/chrome/browser/extensions/api/messaging/native_messaging_apitest_posix.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/extensions/api/record/record_api.h b/chrome/browser/extensions/api/record/record_api.h index 6c8b62f..e5c6189 100644 --- a/chrome/browser/extensions/api/record/record_api.h +++ b/chrome/browser/extensions/api/record/record_api.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_API_RECORD_RECORD_API_H_ #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/time.h" #include "chrome/browser/extensions/extension_function.h" diff --git a/chrome/browser/extensions/api/record/record_api_test.cc b/chrome/browser/extensions/api/record/record_api_test.cc index 03b905a..2700cc2 100644 --- a/chrome/browser/extensions/api/record/record_api_test.cc +++ b/chrome/browser/extensions/api/record/record_api_test.cc @@ -6,8 +6,8 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/extensions/api/serial/serial_connection.cc b/chrome/browser/extensions/api/serial/serial_connection.cc index b976762..b453ee2 100644 --- a/chrome/browser/extensions/api/serial/serial_connection.cc +++ b/chrome/browser/extensions/api/serial/serial_connection.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" namespace extensions { diff --git a/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc b/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc index ed27ebc..ce29ea5 100644 --- a/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc +++ b/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc @@ -4,8 +4,8 @@ #include "chrome/browser/extensions/api/serial/serial_port_enumerator.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.h b/chrome/browser/extensions/api/storage/managed_value_store_cache.h index b21fd89..3973fd5 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.h +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/callback_forward.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc index 0e00f45..29783a9 100644 --- a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc +++ b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/storage/policy_value_store.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/extensions/api/storage/settings_backend.h b/chrome/browser/extensions/api/storage/settings_backend.h index 1a3965e..1706828 100644 --- a/chrome/browser/extensions/api/storage/settings_backend.h +++ b/chrome/browser/extensions/api/storage/settings_backend.h @@ -10,7 +10,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/extensions/api/storage/settings_frontend.cc b/chrome/browser/extensions/api/storage/settings_frontend.cc index cd12a46..91fab87 100644 --- a/chrome/browser/extensions/api/storage/settings_frontend.cc +++ b/chrome/browser/extensions/api/storage/settings_frontend.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "chrome/browser/extensions/api/storage/leveldb_settings_storage_factory.h" #include "chrome/browser/extensions/api/storage/settings_backend.h" diff --git a/chrome/browser/extensions/api/storage/settings_storage_factory.h b/chrome/browser/extensions/api/storage/settings_storage_factory.h index e0d955b..7fd28cf 100644 --- a/chrome/browser/extensions/api/storage/settings_storage_factory.h +++ b/chrome/browser/extensions/api/storage/settings_storage_factory.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" class ValueStore; diff --git a/chrome/browser/extensions/api/storage/settings_test_util.cc b/chrome/browser/extensions/api/storage/settings_test_util.cc index 3c2d5c7..f201a44 100644 --- a/chrome/browser/extensions/api/storage/settings_test_util.cc +++ b/chrome/browser/extensions/api/storage/settings_test_util.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/storage/settings_test_util.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/extensions/api/storage/settings_frontend.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc b/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc index cd41bf4..f6d5d1b 100644 --- a/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/sequenced_task_runner.h" #include "chrome/browser/extensions/api/storage/settings_backend.h" #include "chrome/browser/extensions/api/storage/settings_frontend.h" diff --git a/chrome/browser/extensions/api/system_info_storage/storage_info_provider_linux.h b/chrome/browser/extensions/api/system_info_storage/storage_info_provider_linux.h index c82e38c..5c14848 100644 --- a/chrome/browser/extensions/api/system_info_storage/storage_info_provider_linux.h +++ b/chrome/browser/extensions/api/system_info_storage/storage_info_provider_linux.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_STORAGE_STORAGE_INFO_PROVIDER_LINUX_H_ #define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_STORAGE_STORAGE_INFO_PROVIDER_LINUX_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/extensions/api/system_info_storage/storage_info_provider.h" #include "chrome/browser/storage_monitor/udev_util_linux.h" diff --git a/chrome/browser/extensions/api/web_request/upload_data_presenter.cc b/chrome/browser/extensions/api/web_request/upload_data_presenter.cc index b1a1d05..e10ded0 100644 --- a/chrome/browser/extensions/api/web_request/upload_data_presenter.cc +++ b/chrome/browser/extensions/api/web_request/upload_data_presenter.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/web_request/upload_data_presenter.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/extensions/api/web_request/form_data_parser.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index 5559a5b..12ff0e2 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc index 3d24fab..72ba236 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc @@ -4,8 +4,8 @@ #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h" diff --git a/chrome/browser/extensions/app_notification_manager.cc b/chrome/browser/extensions/app_notification_manager.cc index 986c40d..2432cde 100644 --- a/chrome/browser/extensions/app_notification_manager.cc +++ b/chrome/browser/extensions/app_notification_manager.cc @@ -6,7 +6,7 @@ #include "base/auto_reset.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/metrics/histogram.h" #include "base/perftimer.h" diff --git a/chrome/browser/extensions/app_notification_storage.cc b/chrome/browser/extensions/app_notification_storage.cc index e527d43..30d7977 100644 --- a/chrome/browser/extensions/app_notification_storage.cc +++ b/chrome/browser/extensions/app_notification_storage.cc @@ -4,8 +4,8 @@ #include "chrome/browser/extensions/app_notification_storage.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/location.h" diff --git a/chrome/browser/extensions/app_notification_storage_unittest.cc b/chrome/browser/extensions/app_notification_storage_unittest.cc index a0a0bdd..ae0ca6e 100644 --- a/chrome/browser/extensions/app_notification_storage_unittest.cc +++ b/chrome/browser/extensions/app_notification_storage_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_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h index 58b998f..7f4bb8c 100644 --- a/chrome/browser/extensions/component_loader.h +++ b/chrome/browser/extensions/component_loader.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/values.h" diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index 8e06161..ad200b6 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/base64.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/json/json_file_value_serializer.h" #include "base/path_service.h" diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc index 3c5901e..e87cb1f 100644 --- a/chrome/browser/extensions/convert_user_script_unittest.cc +++ b/chrome/browser/extensions/convert_user_script_unittest.cc @@ -5,8 +5,8 @@ #include <string> #include <vector> -#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/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc index 820a09d..dc65e33 100644 --- a/chrome/browser/extensions/convert_web_app.cc +++ b/chrome/browser/extensions/convert_web_app.cc @@ -10,8 +10,8 @@ #include <vector> #include "base/base64.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/json/json_file_value_serializer.h" #include "base/logging.h" diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc index 60db8dc..8b9e0c5 100644 --- a/chrome/browser/extensions/convert_web_app_unittest.cc +++ b/chrome/browser/extensions/convert_web_app_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include <vector> -#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/stringprintf.h" diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h index a0152f1..90ad001 100644 --- a/chrome/browser/extensions/crx_installer.h +++ b/chrome/browser/extensions/crx_installer.h @@ -8,7 +8,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/version.h" diff --git a/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc b/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc index a4cfe60..c4b3deb 100644 --- a/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc +++ b/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index 30cb051..2a87f37 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -7,8 +7,8 @@ #include <vector> #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/stringprintf.h" diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h index 864ab0b..1923857 100644 --- a/chrome/browser/extensions/extension_browsertest.h +++ b/chrome/browser/extensions/extension_browsertest.h @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_system.h" diff --git a/chrome/browser/extensions/extension_creator_filter.cc b/chrome/browser/extensions/extension_creator_filter.cc index 31fe356..a904d31 100644 --- a/chrome/browser/extensions/extension_creator_filter.cc +++ b/chrome/browser/extensions/extension_creator_filter.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/extension_creator_filter.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #if defined(OS_WIN) #include <windows.h> diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc index 31ca7b3..2007a98 100644 --- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/extension_browsertest.h" diff --git a/chrome/browser/extensions/extension_function_test_utils.cc b/chrome/browser/extensions/extension_function_test_utils.cc index b2d9283..b642c1f 100644 --- a/chrome/browser/extensions/extension_function_test_utils.cc +++ b/chrome/browser/extensions/extension_function_test_utils.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/values.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc index 1640c84f..ce13401 100644 --- a/chrome/browser/extensions/extension_nacl_browsertest.cc +++ b/chrome/browser/extensions/extension_nacl_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc index 8c8b626..006d1d9 100644 --- a/chrome/browser/extensions/extension_protocols.cc +++ b/chrome/browser/extensions/extension_protocols.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" diff --git a/chrome/browser/extensions/extension_resource_protocols.cc b/chrome/browser/extensions/extension_resource_protocols.cc index 0e613dd..03f2a67 100644 --- a/chrome/browser/extensions/extension_resource_protocols.cc +++ b/chrome/browser/extensions/extension_resource_protocols.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/extension_resource_protocols.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_file_util.h" diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index 810725c..f86c72b 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -12,7 +12,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/extensions/extension_service_unittest.h b/chrome/browser/extensions/extension_service_unittest.h index 20e9202..f5bd434 100644 --- a/chrome/browser/extensions/extension_service_unittest.h +++ b/chrome/browser/extensions/extension_service_unittest.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_UNITTEST_H_ #include "base/at_exit.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index 50d01f5..83fb022 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc @@ -5,8 +5,8 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_util.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/extensions/extension_sync_data_unittest.cc b/chrome/browser/extensions/extension_sync_data_unittest.cc index 80147a8..f7bad7e 100644 --- a/chrome/browser/extensions/extension_sync_data_unittest.cc +++ b/chrome/browser/extensions/extension_sync_data_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/extension_sync_data.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/version.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc index d1031f2..dd7e8be 100644 --- a/chrome/browser/extensions/extension_system.cc +++ b/chrome/browser/extensions/extension_system.cc @@ -7,7 +7,7 @@ #include "base/base_switches.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/pref_service.h" #include "base/strings/string_tokenizer.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/extensions/external_loader.h b/chrome/browser/extensions/external_loader.h index 20971f0..1215836 100644 --- a/chrome/browser/extensions/external_loader.h +++ b/chrome/browser/extensions/external_loader.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTERNAL_LOADER_H_ #define CHROME_BROWSER_EXTENSIONS_EXTERNAL_LOADER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc index 0f025a1..b0c89d2 100644 --- a/chrome/browser/extensions/external_pref_loader.cc +++ b/chrome/browser/extensions/external_pref_loader.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/external_pref_loader.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc index d067778..0cd1971 100644 --- a/chrome/browser/extensions/external_provider_impl.cc +++ b/chrome/browser/extensions/external_provider_impl.cc @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/external_provider_impl.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/linked_ptr.h" #include "base/metrics/field_trial.h" diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc index 988135b..23ed0ab 100644 --- a/chrome/browser/extensions/external_registry_loader_win.cc +++ b/chrome/browser/extensions/external_registry_loader_win.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/external_registry_loader_win.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_handle.h" #include "base/metrics/histogram.h" #include "base/string_util.h" diff --git a/chrome/browser/extensions/file_reader_unittest.cc b/chrome/browser/extensions/file_reader_unittest.cc index 3b89e1f..71ef3c8 100644 --- a/chrome/browser/extensions/file_reader_unittest.cc +++ b/chrome/browser/extensions/file_reader_unittest.cc @@ -4,8 +4,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "chrome/browser/extensions/file_reader.h" diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc index 22d4149..deb0f85 100644 --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/installed_loader.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/metrics/histogram.h" #include "base/stringprintf.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index b412272..f35694e 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_model.h" +#include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/extensions/browser_action_test_util.h" #include "chrome/browser/extensions/extension_apitest.h" diff --git a/chrome/browser/extensions/pack_extension_job.h b/chrome/browser/extensions/pack_extension_job.h index 348274d..50fc1eb 100644 --- a/chrome/browser/extensions/pack_extension_job.h +++ b/chrome/browser/extensions/pack_extension_job.h @@ -7,11 +7,11 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/string16.h" -#include "content/public/browser/browser_thread.h" #include "chrome/browser/extensions/extension_creator.h" +#include "content/public/browser/browser_thread.h" namespace extensions { diff --git a/chrome/browser/extensions/permissions_updater_unittest.cc b/chrome/browser/extensions/permissions_updater_unittest.cc index 4908146..14e3610 100644 --- a/chrome/browser/extensions/permissions_updater_unittest.cc +++ b/chrome/browser/extensions/permissions_updater_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" diff --git a/chrome/browser/extensions/platform_app_launcher.cc b/chrome/browser/extensions/platform_app_launcher.cc index 8527476..78548d8 100644 --- a/chrome/browser/extensions/platform_app_launcher.cc +++ b/chrome/browser/extensions/platform_app_launcher.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/platform_app_launcher.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/memory/ref_counted.h" #include "base/string_util.h" diff --git a/chrome/browser/extensions/requirements_checker_browsertest.cc b/chrome/browser/extensions/requirements_checker_browsertest.cc index 2f54dfa..192239d 100644 --- a/chrome/browser/extensions/requirements_checker_browsertest.cc +++ b/chrome/browser/extensions/requirements_checker_browsertest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/extensions/sandboxed_unpacker.h b/chrome/browser/extensions/sandboxed_unpacker.h index 2a8f414..d4ef975 100644 --- a/chrome/browser/extensions/sandboxed_unpacker.h +++ b/chrome/browser/extensions/sandboxed_unpacker.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/time.h" diff --git a/chrome/browser/extensions/script_bubble_controller_unittest.cc b/chrome/browser/extensions/script_bubble_controller_unittest.cc index d2b0ef9..12bc49d 100644 --- a/chrome/browser/extensions/script_bubble_controller_unittest.cc +++ b/chrome/browser/extensions/script_bubble_controller_unittest.cc @@ -5,7 +5,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "chrome/browser/extensions/component_loader.h" diff --git a/chrome/browser/extensions/state_store.h b/chrome/browser/extensions/state_store.h index fa11422..e9b4f3c 100644 --- a/chrome/browser/extensions/state_store.h +++ b/chrome/browser/extensions/state_store.h @@ -8,7 +8,7 @@ #include <set> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/value_store/value_store_frontend.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/extensions/system_info_event_router.h b/chrome/browser/extensions/system_info_event_router.h index 4569f2a..9e8d53b 100644 --- a/chrome/browser/extensions/system_info_event_router.h +++ b/chrome/browser/extensions/system_info_event_router.h @@ -7,7 +7,7 @@ #include <set> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/values.h" #include "chrome/browser/extensions/api/system_info_storage/storage_info_provider.h" diff --git a/chrome/browser/extensions/unpacked_installer.h b/chrome/browser/extensions/unpacked_installer.h index 61790d0..6f78492 100644 --- a/chrome/browser/extensions/unpacked_installer.h +++ b/chrome/browser/extensions/unpacked_installer.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/extensions/updater/extension_downloader.cc b/chrome/browser/extensions/updater/extension_downloader.cc index ded33d4..71389d3 100644 --- a/chrome/browser/extensions/updater/extension_downloader.cc +++ b/chrome/browser/extensions/updater/extension_downloader.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_handle.h" diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h index b51d9a7..ffb40e9 100644 --- a/chrome/browser/extensions/updater/extension_updater.h +++ b/chrome/browser/extensions/updater/extension_updater.h @@ -13,7 +13,7 @@ #include "base/callback_forward.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc index 3e51c11..9c270da 100644 --- a/chrome/browser/extensions/user_script_master.cc +++ b/chrome/browser/extensions/user_script_master.cc @@ -9,8 +9,8 @@ #include <vector> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/pickle.h" #include "base/stl_util.h" #include "base/string_util.h" diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h index 050995f..da050f8 100644 --- a/chrome/browser/extensions/user_script_master.h +++ b/chrome/browser/extensions/user_script_master.h @@ -9,7 +9,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc index 9f10a42..d71dd2a 100644 --- a/chrome/browser/extensions/user_script_master_unittest.cc +++ b/chrome/browser/extensions/user_script_master_unittest.cc @@ -6,8 +6,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/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/fast_shutdown_browsertest.cc b/chrome/browser/fast_shutdown_browsertest.cc index 0829617..5b7c3fb 100644 --- a/chrome/browser/fast_shutdown_browsertest.cc +++ b/chrome/browser/fast_shutdown_browsertest.cc @@ -4,7 +4,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/feedback/feedback_util.h b/chrome/browser/feedback/feedback_util.h index f7e4670..cf32ac5 100644 --- a/chrome/browser/feedback/feedback_util.h +++ b/chrome/browser/feedback/feedback_util.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/feedback/feedback_data.h" #include "chrome/browser/feedback/proto/common.pb.h" #include "chrome/browser/feedback/proto/dom.pb.h" diff --git a/chrome/browser/first_run/first_run_linux.cc b/chrome/browser/first_run/first_run_linux.cc index c1a2c9d..6885c57 100644 --- a/chrome/browser/first_run/first_run_linux.cc +++ b/chrome/browser/first_run/first_run_linux.cc @@ -5,8 +5,8 @@ #include "chrome/browser/first_run/first_run.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/string_piece.h" diff --git a/chrome/browser/first_run/first_run_mac.mm b/chrome/browser/first_run/first_run_mac.mm index c4d2730..cd6ecc6 100644 --- a/chrome/browser/first_run/first_run_mac.mm +++ b/chrome/browser/first_run/first_run_mac.mm @@ -4,11 +4,11 @@ #include "chrome/browser/first_run/first_run.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "chrome/browser/first_run/first_run_internal.h" -#include "chrome/browser/importer/importer_host.h" #include "chrome/browser/importer/external_process_importer_host.h" +#include "chrome/browser/importer/importer_host.h" #include "chrome/browser/mac/master_prefs.h" #include "chrome/browser/process_singleton.h" diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index 429b0b9..766ac29 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -10,8 +10,8 @@ #include "base/callback.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/process_util.h" diff --git a/chrome/browser/first_run/upgrade_util_linux.cc b/chrome/browser/first_run/upgrade_util_linux.cc index 1a976a4..22b252c 100644 --- a/chrome/browser/first_run/upgrade_util_linux.cc +++ b/chrome/browser/first_run/upgrade_util_linux.cc @@ -6,8 +6,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/logging.h" #include "base/path_service.h" #include "base/platform_file.h" diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc index a9e9f19..59754ad 100644 --- a/chrome/browser/first_run/upgrade_util_win.cc +++ b/chrome/browser/first_run/upgrade_util_win.cc @@ -13,8 +13,8 @@ #include "base/base_paths.h" #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/path_service.h" #include "base/process_util.h" diff --git a/chrome/browser/google/google_update_win.cc b/chrome/browser/google/google_update_win.cc index bdb122d..ee732bf 100644 --- a/chrome/browser/google/google_update_win.cc +++ b/chrome/browser/google/google_update_win.cc @@ -8,7 +8,7 @@ #include <atlcom.h> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/chrome/browser/google/google_util_chromeos.cc b/chrome/browser/google/google_util_chromeos.cc index 6e2e7b6..c85ca7a 100644 --- a/chrome/browser/google/google_util_chromeos.cc +++ b/chrome/browser/google/google_util_chromeos.cc @@ -4,8 +4,8 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/prefs/pref_service.h" #include "base/string_util.h" diff --git a/chrome/browser/google_apis/drive_api_operations_unittest.cc b/chrome/browser/google_apis/drive_api_operations_unittest.cc index b42fb7f..08d542c 100644 --- a/chrome/browser/google_apis/drive_api_operations_unittest.cc +++ b/chrome/browser/google_apis/drive_api_operations_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop_proxy.h" #include "base/values.h" #include "chrome/browser/google_apis/drive_api_operations.h" diff --git a/chrome/browser/google_apis/drive_api_parser.cc b/chrome/browser/google_apis/drive_api_parser.cc index 97e175a..403c4a4 100644 --- a/chrome/browser/google_apis/drive_api_parser.cc +++ b/chrome/browser/google_apis/drive_api_parser.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_value_converter.h" #include "base/memory/scoped_ptr.h" #include "base/string_piece.h" diff --git a/chrome/browser/google_apis/drive_api_parser_unittest.cc b/chrome/browser/google_apis/drive_api_parser_unittest.cc index d0747ec..00df543b 100644 --- a/chrome/browser/google_apis/drive_api_parser_unittest.cc +++ b/chrome/browser/google_apis/drive_api_parser_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/google_apis/drive_api_parser.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "base/string16.h" diff --git a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc index 79eb676..a70ba57 100644 --- a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc +++ b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc @@ -6,8 +6,8 @@ #include <map> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop_proxy.h" #include "base/string_split.h" #include "base/stringprintf.h" diff --git a/chrome/browser/google_apis/gdata_wapi_parser.cc b/chrome/browser/google_apis/gdata_wapi_parser.cc index 1290947..fd034f7 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser.cc +++ b/chrome/browser/google_apis/gdata_wapi_parser.cc @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_value_converter.h" #include "base/memory/scoped_ptr.h" #include "base/string_piece.h" diff --git a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc index 4824d5b..6f4441a 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc +++ b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc @@ -6,8 +6,8 @@ #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/chrome/browser/google_apis/mock_drive_service.cc b/chrome/browser/google_apis/mock_drive_service.cc index a49df27..4f4f345 100644 --- a/chrome/browser/google_apis/mock_drive_service.cc +++ b/chrome/browser/google_apis/mock_drive_service.cc @@ -5,8 +5,8 @@ #include "chrome/browser/google_apis/mock_drive_service.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/location.h" #include "base/message_loop_proxy.h" diff --git a/chrome/browser/google_apis/operation_registry.h b/chrome/browser/google_apis/operation_registry.h index 2d43658..4533c36 100644 --- a/chrome/browser/google_apis/operation_registry.h +++ b/chrome/browser/google_apis/operation_registry.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/id_map.h" #include "base/observer_list.h" #include "base/time.h" diff --git a/chrome/browser/history/android/android_cache_database.h b/chrome/browser/history/android/android_cache_database.h index 829efb3..17e81f6 100644 --- a/chrome/browser/history/android/android_cache_database.h +++ b/chrome/browser/history/android/android_cache_database.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_HISTORY_ANDROID_ANDROID_CACHE_DATABASE_H_ #define CHROME_BROWSER_HISTORY_ANDROID_ANDROID_CACHE_DATABASE_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/time.h" #include "chrome/browser/history/android/android_history_types.h" diff --git a/chrome/browser/history/android/android_cache_database_unittest.cc b/chrome/browser/history/android/android_cache_database_unittest.cc index 77382a8..d8fb0d5 100644 --- a/chrome/browser/history/android/android_cache_database_unittest.cc +++ b/chrome/browser/history/android/android_cache_database_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_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/android/android_cache_database.h" diff --git a/chrome/browser/history/android/android_provider_backend.h b/chrome/browser/history/android/android_provider_backend.h index bc1ab16..7cc8644 100644 --- a/chrome/browser/history/android/android_provider_backend.h +++ b/chrome/browser/history/android/android_provider_backend.h @@ -7,7 +7,7 @@ #include <set> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/hash_tables.h" #include "base/memory/ref_counted.h" diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc index be9e0c9..b26e368 100644 --- a/chrome/browser/history/android/android_provider_backend_unittest.cc +++ b/chrome/browser/history/android/android_provider_backend_unittest.cc @@ -6,8 +6,8 @@ #include <vector> -#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/memory/ref_counted.h" #include "base/stringprintf.h" diff --git a/chrome/browser/history/android/android_urls_database_unittest.cc b/chrome/browser/history/android/android_urls_database_unittest.cc index 8a4e1a7..cf970e5 100644 --- a/chrome/browser/history/android/android_urls_database_unittest.cc +++ b/chrome/browser/history/android/android_urls_database_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/history/android/android_urls_database.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 "chrome/browser/history/history_database.h" diff --git a/chrome/browser/history/android/urls_sql_handler_unittest.cc b/chrome/browser/history/android/urls_sql_handler_unittest.cc index 7d79a6e..06bfa79 100644 --- a/chrome/browser/history/android/urls_sql_handler_unittest.cc +++ b/chrome/browser/history/android/urls_sql_handler_unittest.cc @@ -6,8 +6,8 @@ #include "chrome/browser/history/android/urls_sql_handler.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/stringprintf.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/history/android/visit_sql_handler_unittest.cc b/chrome/browser/history/android/visit_sql_handler_unittest.cc index c54827a..a299468 100644 --- a/chrome/browser/history/android/visit_sql_handler_unittest.cc +++ b/chrome/browser/history/android/visit_sql_handler_unittest.cc @@ -6,8 +6,8 @@ #include "chrome/browser/history/android/visit_sql_handler.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/stringprintf.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/history/download_database.cc b/chrome/browser/history/download_database.cc index 0a0ba8f..0b91d4d 100644 --- a/chrome/browser/history/download_database.cc +++ b/chrome/browser/history/download_database.cc @@ -9,7 +9,7 @@ #include <vector> #include "base/debug/alias.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/stl_util.h" diff --git a/chrome/browser/history/download_row.h b/chrome/browser/history/download_row.h index f1435cb1..2f8b63b 100644 --- a/chrome/browser/history/download_row.h +++ b/chrome/browser/history/download_row.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/time.h" #include "content/public/browser/download_danger_type.h" #include "content/public/browser/download_interrupt_reasons.h" diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc index 3a9c08d..93fc873 100644 --- a/chrome/browser/history/expire_history_backend_unittest.cc +++ b/chrome/browser/history/expire_history_backend_unittest.cc @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.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/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h index c92fcfe..04c5c82 100644 --- a/chrome/browser/history/history_backend.h +++ b/chrome/browser/history/history_backend.h @@ -11,7 +11,7 @@ #include <vector> #include "base/containers/mru_cache.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/history/archived_database.h" diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc index ba6c328..240b169 100644 --- a/chrome/browser/history/history_backend_unittest.cc +++ b/chrome/browser/history/history_backend_unittest.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/history/history_database_unittest.cc b/chrome/browser/history/history_database_unittest.cc index e5354ad..06cac35 100644 --- a/chrome/browser/history/history_database_unittest.cc +++ b/chrome/browser/history/history_database_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/history/history_database.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 "chrome/common/chrome_paths.h" diff --git a/chrome/browser/history/history_querying_unittest.cc b/chrome/browser/history/history_querying_unittest.cc index d1cf16b..c1355dd 100644 --- a/chrome/browser/history/history_querying_unittest.cc +++ b/chrome/browser/history/history_querying_unittest.cc @@ -5,8 +5,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.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/utf_string_conversions.h" diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h index fd0a669..f39bef0 100644 --- a/chrome/browser/history/history_service.h +++ b/chrome/browser/history/history_service.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index 1cedb19..83e7b22 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_unittest.cc @@ -28,8 +28,8 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/compiler_specific.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/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/history/in_memory_database.cc b/chrome/browser/history/in_memory_database.cc index 27b8a34..02b335f 100644 --- a/chrome/browser/history/in_memory_database.cc +++ b/chrome/browser/history/in_memory_database.cc @@ -4,7 +4,7 @@ #include "chrome/browser/history/in_memory_database.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/time.h" diff --git a/chrome/browser/history/in_memory_url_index.h b/chrome/browser/history/in_memory_url_index.h index 557793c..4190c2e 100644 --- a/chrome/browser/history/in_memory_url_index.h +++ b/chrome/browser/history/in_memory_url_index.h @@ -12,7 +12,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/history/in_memory_url_index_unittest.cc b/chrome/browser/history/in_memory_url_index_unittest.cc index e03f42c..8cd4790 100644 --- a/chrome/browser/history/in_memory_url_index_unittest.cc +++ b/chrome/browser/history/in_memory_url_index_unittest.cc @@ -6,8 +6,8 @@ #include <fstream> #include "base/auto_reset.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/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/history/shortcuts_backend.h b/chrome/browser/history/shortcuts_backend.h index 1609e71..2f7eccc 100644 --- a/chrome/browser/history/shortcuts_backend.h +++ b/chrome/browser/history/shortcuts_backend.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/history/shortcuts_database.h b/chrome/browser/history/shortcuts_database.h index 594150a..538ea65 100644 --- a/chrome/browser/history/shortcuts_database.h +++ b/chrome/browser/history/shortcuts_database.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/string16.h" diff --git a/chrome/browser/history/text_database.h b/chrome/browser/history/text_database.h index 99ccff0..cf43848 100644 --- a/chrome/browser/history/text_database.h +++ b/chrome/browser/history/text_database.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "chrome/browser/history/history_types.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/history/text_database_manager.h b/chrome/browser/history/text_database_manager.h index 8d4b296..66e8210 100644 --- a/chrome/browser/history/text_database_manager.h +++ b/chrome/browser/history/text_database_manager.h @@ -11,13 +11,13 @@ #include "base/basictypes.h" #include "base/containers/mru_cache.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/string16.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/history/text_database.h" #include "chrome/browser/history/query_parser.h" +#include "chrome/browser/history/text_database.h" #include "chrome/browser/history/url_database.h" namespace history { diff --git a/chrome/browser/history/text_database_manager_unittest.cc b/chrome/browser/history/text_database_manager_unittest.cc index 23402b9..8185773 100644 --- a/chrome/browser/history/text_database_manager_unittest.cc +++ b/chrome/browser/history/text_database_manager_unittest.cc @@ -4,8 +4,8 @@ #include <set> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/text_database_manager.h" diff --git a/chrome/browser/history/thumbnail_database_unittest.cc b/chrome/browser/history/thumbnail_database_unittest.cc index f041def..fc92feb 100644 --- a/chrome/browser/history/thumbnail_database_unittest.cc +++ b/chrome/browser/history/thumbnail_database_unittest.cc @@ -7,8 +7,8 @@ #include "base/basictypes.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/memory/ref_counted_memory.h" #include "base/path_service.h" diff --git a/chrome/browser/history/top_sites_backend.cc b/chrome/browser/history/top_sites_backend.cc index 93cf6e2..7a4e6e539 100644 --- a/chrome/browser/history/top_sites_backend.cc +++ b/chrome/browser/history/top_sites_backend.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "chrome/browser/history/top_sites_database.h" #include "chrome/common/cancelable_task_tracker.h" diff --git a/chrome/browser/history/top_sites_backend.h b/chrome/browser/history/top_sites_backend.h index 5028286..e77705f 100644 --- a/chrome/browser/history/top_sites_backend.h +++ b/chrome/browser/history/top_sites_backend.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_HISTORY_TOP_SITES_BACKEND_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/history/history_types.h" diff --git a/chrome/browser/history/top_sites_database_unittest.cc b/chrome/browser/history/top_sites_database_unittest.cc index ebd956b..8c509d3 100644 --- a/chrome/browser/history/top_sites_database_unittest.cc +++ b/chrome/browser/history/top_sites_database_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_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "chrome/browser/history/top_sites_database.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/history/url_database_unittest.cc b/chrome/browser/history/url_database_unittest.cc index 6b4cb28..d7c67cf 100644 --- a/chrome/browser/history/url_database_unittest.cc +++ b/chrome/browser/history/url_database_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_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/string_util.h" diff --git a/chrome/browser/history/url_index_private_data.h b/chrome/browser/history/url_index_private_data.h index d2d3ebb..cbb8692 100644 --- a/chrome/browser/history/url_index_private_data.h +++ b/chrome/browser/history/url_index_private_data.h @@ -8,11 +8,11 @@ #include <set> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" -#include "chrome/browser/history/in_memory_url_index_types.h" #include "chrome/browser/history/in_memory_url_index_cache.pb.h" +#include "chrome/browser/history/in_memory_url_index_types.h" #include "chrome/browser/history/scored_history_match.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/history/visit_database_unittest.cc b/chrome/browser/history/visit_database_unittest.cc index a76bef5..bdc33fc 100644 --- a/chrome/browser/history/visit_database_unittest.cc +++ b/chrome/browser/history/visit_database_unittest.cc @@ -5,8 +5,8 @@ #include <set> #include <vector> -#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/string_util.h" diff --git a/chrome/browser/icon_manager_chromeos.cc b/chrome/browser/icon_manager_chromeos.cc index 60d173b..6a918fa 100644 --- a/chrome/browser/icon_manager_chromeos.cc +++ b/chrome/browser/icon_manager_chromeos.cc @@ -4,7 +4,7 @@ #include "chrome/browser/icon_manager.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" IconGroupID IconManager::GetGroupIDFromFilepath( diff --git a/chrome/browser/icon_manager_mac.mm b/chrome/browser/icon_manager_mac.mm index 09361ba..08b9328 100644 --- a/chrome/browser/icon_manager_mac.mm +++ b/chrome/browser/icon_manager_mac.mm @@ -4,7 +4,7 @@ #include "chrome/browser/icon_manager.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/sys_string_conversions.h" IconGroupID IconManager::GetGroupIDFromFilepath( diff --git a/chrome/browser/icon_manager_win.cc b/chrome/browser/icon_manager_win.cc index 7bf192f..a16e02e 100644 --- a/chrome/browser/icon_manager_win.cc +++ b/chrome/browser/icon_manager_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/icon_manager.h" -#include "base/file_path.h" +#include "base/files/file_path.h" IconGroupID IconManager::GetGroupIDFromFilepath( const base::FilePath& filepath) { diff --git a/chrome/browser/iframe_browsertest.cc b/chrome/browser/iframe_browsertest.cc index 9e46ba4..629175a 100644 --- a/chrome/browser/iframe_browsertest.cc +++ b/chrome/browser/iframe_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index 8e88d23..9813a28 100644 --- a/chrome/browser/importer/firefox2_importer.cc +++ b/chrome/browser/importer/firefox2_importer.cc @@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/icu_string_conversions.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/importer/firefox2_importer.h b/chrome/browser/importer/firefox2_importer.h index a8d880e..5beb626 100644 --- a/chrome/browser/importer/firefox2_importer.h +++ b/chrome/browser/importer/firefox2_importer.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/string16.h" #include "chrome/browser/importer/importer.h" diff --git a/chrome/browser/importer/firefox3_importer.h b/chrome/browser/importer/firefox3_importer.h index 877a0fa..2cfa869 100644 --- a/chrome/browser/importer/firefox3_importer.h +++ b/chrome/browser/importer/firefox3_importer.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/importer/importer.h" class GURL; diff --git a/chrome/browser/importer/firefox_importer_unittest.cc b/chrome/browser/importer/firefox_importer_unittest.cc index 6551b35..eabc47b 100644 --- a/chrome/browser/importer/firefox_importer_unittest.cc +++ b/chrome/browser/importer/firefox_importer_unittest.cc @@ -5,8 +5,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/stl_util.h" #include "base/string16.h" diff --git a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc index 1a52bb1a..638f860 100644 --- a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc +++ b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc @@ -4,11 +4,11 @@ #include "chrome/browser/importer/firefox_importer_unittest_utils.h" -#include "base/bind.h" #include "base/base_switches.h" +#include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/test/test_timeouts.h" #include "chrome/browser/importer/firefox_importer_utils.h" diff --git a/chrome/browser/importer/firefox_profile_lock.cc b/chrome/browser/importer/firefox_profile_lock.cc index 1232890..dab0381 100644 --- a/chrome/browser/importer/firefox_profile_lock.cc +++ b/chrome/browser/importer/firefox_profile_lock.cc @@ -4,7 +4,7 @@ #include "chrome/browser/importer/firefox_profile_lock.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/threading/thread_restrictions.h" // This class is based on Firefox code in: diff --git a/chrome/browser/importer/firefox_profile_lock.h b/chrome/browser/importer/firefox_profile_lock.h index 98141675..ff0d53c 100644 --- a/chrome/browser/importer/firefox_profile_lock.h +++ b/chrome/browser/importer/firefox_profile_lock.h @@ -12,7 +12,7 @@ #endif #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" // Firefox is designed to allow only one application to access its diff --git a/chrome/browser/importer/firefox_proxy_settings.cc b/chrome/browser/importer/firefox_proxy_settings.cc index 427bca84..be2b2a8 100644 --- a/chrome/browser/importer/firefox_proxy_settings.cc +++ b/chrome/browser/importer/firefox_proxy_settings.cc @@ -4,7 +4,7 @@ #include "chrome/browser/importer/firefox_proxy_settings.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/strings/string_tokenizer.h" #include "base/values.h" diff --git a/chrome/browser/importer/firefox_proxy_settings_unittest.cc b/chrome/browser/importer/firefox_proxy_settings_unittest.cc index 3912793..7699e13 100644 --- a/chrome/browser/importer/firefox_proxy_settings_unittest.cc +++ b/chrome/browser/importer/firefox_proxy_settings_unittest.cc @@ -4,7 +4,7 @@ #include "testing/gtest/include/gtest/gtest.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/browser/importer/firefox_proxy_settings.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index b1d606b..7a87ea9 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -15,8 +15,8 @@ #include <string> #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "base/string_split.h" #include "base/string_util.h" diff --git a/chrome/browser/importer/ie_importer.h b/chrome/browser/importer/ie_importer.h index f072d5a..5330610 100644 --- a/chrome/browser/importer/ie_importer.h +++ b/chrome/browser/importer/ie_importer.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" -#include "base/file_path.h" #include "base/string16.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/importer/profile_writer.h" diff --git a/chrome/browser/importer/importer_data_types.h b/chrome/browser/importer/importer_data_types.h index 996d2be..90c8075 100644 --- a/chrome/browser/importer/importer_data_types.h +++ b/chrome/browser/importer/importer_data_types.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/string16.h" #include "chrome/browser/importer/importer_type.h" diff --git a/chrome/browser/importer/mork_reader.cc b/chrome/browser/importer/mork_reader.cc index 0181468..afcd585 100644 --- a/chrome/browser/importer/mork_reader.cc +++ b/chrome/browser/importer/mork_reader.cc @@ -44,7 +44,7 @@ #include <algorithm> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/icu_string_conversions.h" #include "base/logging.h" #include "base/message_loop.h" diff --git a/chrome/browser/importer/nss_decryptor_mac.mm b/chrome/browser/importer/nss_decryptor_mac.mm index ebcd271..caaa496 100644 --- a/chrome/browser/importer/nss_decryptor_mac.mm +++ b/chrome/browser/importer/nss_decryptor_mac.mm @@ -6,12 +6,12 @@ #include <dlfcn.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/sys_string_conversions.h" -#include "chrome/browser/importer/nss_decryptor_mac.h" #include "chrome/browser/importer/firefox_importer_utils.h" +#include "chrome/browser/importer/nss_decryptor_mac.h" // Important!! : On OS X the nss3 libraries are compiled with depedencies // on one another, referenced using dyld's @executable_path directive. diff --git a/chrome/browser/importer/nss_decryptor_system_nss.cc b/chrome/browser/importer/nss_decryptor_system_nss.cc index 10a4c62..388caa4 100644 --- a/chrome/browser/importer/nss_decryptor_system_nss.cc +++ b/chrome/browser/importer/nss_decryptor_system_nss.cc @@ -8,7 +8,7 @@ #include <pk11sdr.h> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "base/sys_string_conversions.h" #include "crypto/nss_util.h" diff --git a/chrome/browser/importer/nss_decryptor_win.cc b/chrome/browser/importer/nss_decryptor_win.cc index a6fe5453e..bc6ef4b 100644 --- a/chrome/browser/importer/nss_decryptor_win.cc +++ b/chrome/browser/importer/nss_decryptor_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/importer/nss_decryptor_win.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/sys_string_conversions.h" namespace { diff --git a/chrome/browser/importer/safari_importer.h b/chrome/browser/importer/safari_importer.h index bf01630..6c2d80c 100644 --- a/chrome/browser/importer/safari_importer.h +++ b/chrome/browser/importer/safari_importer.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/importer/profile_writer.h" diff --git a/chrome/browser/importer/safari_importer_unittest.mm b/chrome/browser/importer/safari_importer_unittest.mm index ca9e700..0ae2401 100644 --- a/chrome/browser/importer/safari_importer_unittest.mm +++ b/chrome/browser/importer/safari_importer_unittest.mm @@ -5,8 +5,8 @@ #include "chrome/browser/importer/safari_importer.h" #include "base/basictypes.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/string16.h" diff --git a/chrome/browser/mac/install_from_dmg.mm b/chrome/browser/mac/install_from_dmg.mm index e6cbe72..1d4718e 100644 --- a/chrome/browser/mac/install_from_dmg.mm +++ b/chrome/browser/mac/install_from_dmg.mm @@ -4,8 +4,8 @@ #include "chrome/browser/mac/install_from_dmg.h" -#include <ApplicationServices/ApplicationServices.h> #import <AppKit/AppKit.h> +#include <ApplicationServices/ApplicationServices.h> #include <CoreFoundation/CoreFoundation.h> #include <CoreServices/CoreServices.h> #include <DiskArbitration/DiskArbitration.h> @@ -19,7 +19,7 @@ #include "base/auto_reset.h" #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/authorization_util.h" #include "base/mac/bundle_locations.h" diff --git a/chrome/browser/mac/master_prefs.h b/chrome/browser/mac/master_prefs.h index fc7ccd6..91a11f8 100644 --- a/chrome/browser/mac/master_prefs.h +++ b/chrome/browser/mac/master_prefs.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_MAC_MASTER_PREFS_H_ #define CHROME_BROWSER_MAC_MASTER_PREFS_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" namespace master_prefs { diff --git a/chrome/browser/managed_mode/managed_mode_site_list.h b/chrome/browser/managed_mode/managed_mode_site_list.h index 015b005..2b04189 100644 --- a/chrome/browser/managed_mode/managed_mode_site_list.h +++ b/chrome/browser/managed_mode/managed_mode_site_list.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/chrome/browser/managed_mode/managed_mode_url_filter.cc b/chrome/browser/managed_mode/managed_mode_url_filter.cc index b4d2b79..9ca943f 100644 --- a/chrome/browser/managed_mode/managed_mode_url_filter.cc +++ b/chrome/browser/managed_mode/managed_mode_url_filter.cc @@ -4,7 +4,7 @@ #include "chrome/browser/managed_mode/managed_mode_url_filter.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/json/json_file_value_serializer.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc b/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc index 7831699f..43f80cb 100644 --- a/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc +++ b/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc @@ -5,8 +5,8 @@ #include "chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/sequenced_task_runner.h" #include "base/string_util.h" #include "chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h" diff --git a/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h b/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h index 63c7de2..308d3ca 100644 --- a/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h +++ b/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/time.h" #include "device/media_transfer_protocol/mtp_file_entry.pb.h" #include "webkit/fileapi/file_system_file_util.h" diff --git a/chrome/browser/media_gallery/linux/mtp_read_file_worker.h b/chrome/browser/media_gallery/linux/mtp_read_file_worker.h index 0d31f9b..e373573 100644 --- a/chrome/browser/media_gallery/linux/mtp_read_file_worker.h +++ b/chrome/browser/media_gallery/linux/mtp_read_file_worker.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/cancellation_flag.h" diff --git a/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h b/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h index 0b7801f..46f8217 100644 --- a/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h +++ b/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/time.h" #include "device/media_transfer_protocol/mtp_file_entry.pb.h" diff --git a/chrome/browser/media_gallery/mac/mtp_device_delegate_impl_mac.h b/chrome/browser/media_gallery/mac/mtp_device_delegate_impl_mac.h index c782255..54b61c9 100644 --- a/chrome/browser/media_gallery/mac/mtp_device_delegate_impl_mac.h +++ b/chrome/browser/media_gallery/mac/mtp_device_delegate_impl_mac.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" diff --git a/chrome/browser/media_gallery/media_file_system_registry.cc b/chrome/browser/media_gallery/media_file_system_registry.cc index 5eb9206..dc8d8b3 100644 --- a/chrome/browser/media_gallery/media_file_system_registry.cc +++ b/chrome/browser/media_gallery/media_file_system_registry.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/media_gallery/media_file_system_registry.h b/chrome/browser/media_gallery/media_file_system_registry.h index 5b28221..61d39dd 100644 --- a/chrome/browser/media_gallery/media_file_system_registry.h +++ b/chrome/browser/media_gallery/media_file_system_registry.h @@ -14,7 +14,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/media_gallery/media_galleries_preferences.h" diff --git a/chrome/browser/media_gallery/media_galleries_preferences.h b/chrome/browser/media_gallery/media_galleries_preferences.h index 9c070ff..18a8eaa 100644 --- a/chrome/browser/media_gallery/media_galleries_preferences.h +++ b/chrome/browser/media_gallery/media_galleries_preferences.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/observer_list.h" #include "base/string16.h" #include "base/time.h" diff --git a/chrome/browser/media_gallery/media_galleries_test_util.cc b/chrome/browser/media_gallery/media_galleries_test_util.cc index 5cf3b48..26cf344 100644 --- a/chrome/browser/media_gallery/media_galleries_test_util.cc +++ b/chrome/browser/media_gallery/media_galleries_test_util.cc @@ -4,8 +4,8 @@ #include "chrome/browser/media_gallery/media_galleries_test_util.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/stringprintf.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/media_gallery/mtp_device_delegate_impl.h b/chrome/browser/media_gallery/mtp_device_delegate_impl.h index 4b4d10e..6051771 100644 --- a/chrome/browser/media_gallery/mtp_device_delegate_impl.h +++ b/chrome/browser/media_gallery/mtp_device_delegate_impl.h @@ -12,7 +12,7 @@ #endif #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "webkit/fileapi/media/mtp_device_async_delegate.h" #include "webkit/fileapi/media/mtp_device_delegate.h" diff --git a/chrome/browser/media_gallery/scoped_mtp_device_map_entry.h b/chrome/browser/media_gallery/scoped_mtp_device_map_entry.h index 62239a4..c5f7bcd 100644 --- a/chrome/browser/media_gallery/scoped_mtp_device_map_entry.h +++ b/chrome/browser/media_gallery/scoped_mtp_device_map_entry.h @@ -10,7 +10,7 @@ #define CHROME_BROWSER_MEDIA_GALLERY_SCOPED_MTP_DEVICE_MAP_ENTRY_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner_helpers.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/media_gallery/win/mtp_device_delegate_impl_win.cc b/chrome/browser/media_gallery/win/mtp_device_delegate_impl_win.cc index 2178950..ac315ee 100644 --- a/chrome/browser/media_gallery/win/mtp_device_delegate_impl_win.cc +++ b/chrome/browser/media_gallery/win/mtp_device_delegate_impl_win.cc @@ -10,8 +10,8 @@ #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner.h" #include "base/sequenced_task_runner_helpers.h" diff --git a/chrome/browser/media_gallery/win/mtp_device_object_enumerator.h b/chrome/browser/media_gallery/win/mtp_device_object_enumerator.h index 079d423..58aa73c 100644 --- a/chrome/browser/media_gallery/win/mtp_device_object_enumerator.h +++ b/chrome/browser/media_gallery/win/mtp_device_object_enumerator.h @@ -8,7 +8,7 @@ #ifndef CHROME_BROWSER_MEDIA_GALLERY_WIN_MTP_DEVICE_OBJECT_ENUMERATOR_H_ #define CHROME_BROWSER_MEDIA_GALLERY_WIN_MTP_DEVICE_OBJECT_ENUMERATOR_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/threading/thread_checker.h" #include "base/time.h" #include "chrome/browser/media_gallery/win/mtp_device_object_entry.h" diff --git a/chrome/browser/media_gallery/win/mtp_device_operations_util.cc b/chrome/browser/media_gallery/win/mtp_device_operations_util.cc index e56a402..fdc095c 100644 --- a/chrome/browser/media_gallery/win/mtp_device_operations_util.cc +++ b/chrome/browser/media_gallery/win/mtp_device_operations_util.cc @@ -9,8 +9,8 @@ #include <algorithm> #include "base/basictypes.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 "base/threading/thread_restrictions.h" diff --git a/chrome/browser/media_gallery/win/recursive_mtp_device_object_enumerator.cc b/chrome/browser/media_gallery/win/recursive_mtp_device_object_enumerator.cc index 9cd29d5..c53d913 100644 --- a/chrome/browser/media_gallery/win/recursive_mtp_device_object_enumerator.cc +++ b/chrome/browser/media_gallery/win/recursive_mtp_device_object_enumerator.cc @@ -6,7 +6,7 @@ #include "chrome/browser/media_gallery/win/recursive_mtp_device_object_enumerator.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/media_gallery/win/mtp_device_object_entry.h" #include "chrome/browser/media_gallery/win/mtp_device_object_enumerator.h" diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc index ad158d5b..cffa884 100644 --- a/chrome/browser/memory_details_mac.cc +++ b/chrome/browser/memory_details_mac.cc @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/mac/mac_util.h" #include "base/process_util.h" #include "base/string_util.h" diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc index 63e7949..5069fe6 100644 --- a/chrome/browser/memory_details_win.cc +++ b/chrome/browser/memory_details_win.cc @@ -7,8 +7,8 @@ #include <psapi.h> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc index 55093ca..29df04f 100644 --- a/chrome/browser/metrics/metrics_service_browsertest.cc +++ b/chrome/browser/metrics/metrics_service_browsertest.cc @@ -8,7 +8,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/metrics/variations/variations_registry_syncer_win.cc b/chrome/browser/metrics/variations/variations_registry_syncer_win.cc index 842a1a0..bb6bb8b 100644 --- a/chrome/browser/metrics/variations/variations_registry_syncer_win.cc +++ b/chrome/browser/metrics/variations/variations_registry_syncer_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/metrics/variations/variations_registry_syncer_win.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/metrics/field_trial.h" #include "base/path_service.h" #include "base/string_number_conversions.h" diff --git a/chrome/browser/mouseleave_browsertest.cc b/chrome/browser/mouseleave_browsertest.cc index e11e442..d1687e3 100644 --- a/chrome/browser/mouseleave_browsertest.cc +++ b/chrome/browser/mouseleave_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h index c321171e..82d8799 100644 --- a/chrome/browser/nacl_host/nacl_process_host.h +++ b/chrome/browser/nacl_host/nacl_process_host.h @@ -7,7 +7,7 @@ #include "build/build_config.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/file_util_proxy.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/nacl_host/pnacl_file_host.cc b/chrome/browser/nacl_host/pnacl_file_host.cc index 966fc7f..ac630f9 100644 --- a/chrome/browser/nacl_host/pnacl_file_host.cc +++ b/chrome/browser/nacl_host/pnacl_file_host.cc @@ -5,8 +5,8 @@ #include "chrome/browser/nacl_host/pnacl_file_host.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/platform_file.h" diff --git a/chrome/browser/nacl_host/pnacl_file_host_unittest.cc b/chrome/browser/nacl_host/pnacl_file_host_unittest.cc index 7c60893..64bdd7b 100644 --- a/chrome/browser/nacl_host/pnacl_file_host_unittest.cc +++ b/chrome/browser/nacl_host/pnacl_file_host_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/nacl_host/pnacl_file_host.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/test/scoped_path_override.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc index 7494f69..c70578d 100644 --- a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc +++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc @@ -7,7 +7,7 @@ #include <string> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/synchronization/waitable_event.h" diff --git a/chrome/browser/net/net_log_temp_file.h b/chrome/browser/net/net_log_temp_file.h index b47899b..83d3d85 100644 --- a/chrome/browser/net/net_log_temp_file.h +++ b/chrome/browser/net/net_log_temp_file.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/net/net_log_temp_file_unittest.cc b/chrome/browser/net/net_log_temp_file_unittest.cc index 688206d..6337b03 100644 --- a/chrome/browser/net/net_log_temp_file_unittest.cc +++ b/chrome/browser/net/net_log_temp_file_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/net/net_log_temp_file.h" #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/values.h" #include "build/build_config.h" diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc index 171683e..2df77c64 100644 --- a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc +++ b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/testing_pref_service.h" diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc index 09b3792..0d14ecf 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc @@ -12,8 +12,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/net/sqlite_server_bound_cert_store.cc b/chrome/browser/net/sqlite_server_bound_cert_store.cc index 1bbe05d..f82812d 100644 --- a/chrome/browser/net/sqlite_server_bound_cert_store.cc +++ b/chrome/browser/net/sqlite_server_bound_cert_store.cc @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/net/transport_security_persister.cc b/chrome/browser/net/transport_security_persister.cc index f6b84cc..5b9d73d 100644 --- a/chrome/browser/net/transport_security_persister.cc +++ b/chrome/browser/net/transport_security_persister.cc @@ -6,8 +6,8 @@ #include "base/base64.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/message_loop.h" diff --git a/chrome/browser/net/transport_security_persister.h b/chrome/browser/net/transport_security_persister.h index acd78bf..6c58dcc 100644 --- a/chrome/browser/net/transport_security_persister.h +++ b/chrome/browser/net/transport_security_persister.h @@ -35,7 +35,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/important_file_writer.h" #include "base/memory/weak_ptr.h" #include "net/base/transport_security_state.h" diff --git a/chrome/browser/net/transport_security_persister_unittest.cc b/chrome/browser/net/transport_security_persister_unittest.cc index bd6e95b..a63655b 100644 --- a/chrome/browser/net/transport_security_persister_unittest.cc +++ b/chrome/browser/net/transport_security_persister_unittest.cc @@ -8,8 +8,8 @@ #include <string> #include <vector> -#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/message_loop.h" #include "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/page_cycler/page_cycler.cc b/chrome/browser/page_cycler/page_cycler.cc index c6813a6d..13bdcd7 100644 --- a/chrome/browser/page_cycler/page_cycler.cc +++ b/chrome/browser/page_cycler/page_cycler.cc @@ -5,8 +5,8 @@ #include "chrome/browser/page_cycler/page_cycler.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/process_util.h" #include "base/string_split.h" diff --git a/chrome/browser/page_cycler/page_cycler.h b/chrome/browser/page_cycler/page_cycler.h index 6d19c3a..5212da9 100644 --- a/chrome/browser/page_cycler/page_cycler.h +++ b/chrome/browser/page_cycler/page_cycler.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PAGE_CYCLER_PAGE_CYCLER_H_ #define CHROME_BROWSER_PAGE_CYCLER_PAGE_CYCLER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "chrome/browser/ui/browser_list_observer.h" #include "content/public/browser/navigation_controller.h" diff --git a/chrome/browser/page_cycler/page_cycler_browsertest.cc b/chrome/browser/page_cycler/page_cycler_browsertest.cc index 3d4b2f3..26096ac 100644 --- a/chrome/browser/page_cycler/page_cycler_browsertest.cc +++ b/chrome/browser/page_cycler/page_cycler_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_split.h" #include "base/string_util.h" diff --git a/chrome/browser/parsers/metadata_parser_filebase.h b/chrome/browser/parsers/metadata_parser_filebase.h index 1a8fa7d..9f7f2b2 100644 --- a/chrome/browser/parsers/metadata_parser_filebase.h +++ b/chrome/browser/parsers/metadata_parser_filebase.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "chrome/browser/parsers/metadata_parser.h" diff --git a/chrome/browser/parsers/metadata_parser_filebase_unittest.cc b/chrome/browser/parsers/metadata_parser_filebase_unittest.cc index 0dc6237..170dd06 100644 --- a/chrome/browser/parsers/metadata_parser_filebase_unittest.cc +++ b/chrome/browser/parsers/metadata_parser_filebase_unittest.cc @@ -5,8 +5,8 @@ #include <map> #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/string_util.h" // TODO(brettw) remove when WideToASCII moves. #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc index 16021c2..366ded3 100644 --- a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc +++ b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc @@ -4,7 +4,7 @@ #include "chrome/browser/parsers/metadata_parser_jpeg_factory.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "chrome/browser/parsers/metadata_parser_jpeg.h" diff --git a/chrome/browser/password_manager/login_database.cc b/chrome/browser/password_manager/login_database.cc index 078c417..aef1583 100644 --- a/chrome/browser/password_manager/login_database.cc +++ b/chrome/browser/password_manager/login_database.cc @@ -7,8 +7,8 @@ #include <algorithm> #include <limits> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/time.h" diff --git a/chrome/browser/password_manager/login_database.h b/chrome/browser/password_manager/login_database.h index b5e38ef..32e859c 100644 --- a/chrome/browser/password_manager/login_database.h +++ b/chrome/browser/password_manager/login_database.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "content/public/common/password_form.h" #include "sql/connection.h" diff --git a/chrome/browser/pepper_broker_infobar_delegate.h b/chrome/browser/pepper_broker_infobar_delegate.h index 93ac80f..694ddc6 100644 --- a/chrome/browser/pepper_broker_infobar_delegate.h +++ b/chrome/browser/pepper_broker_infobar_delegate.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PEPPER_BROKER_INFOBAR_DELEGATE_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/performance_monitor/database.cc b/chrome/browser/performance_monitor/database.cc index 67095a0..de813f3 100644 --- a/chrome/browser/performance_monitor/database.cc +++ b/chrome/browser/performance_monitor/database.cc @@ -4,8 +4,8 @@ #include "chrome/browser/performance_monitor/database.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" diff --git a/chrome/browser/performance_monitor/database.h b/chrome/browser/performance_monitor/database.h index 27db256..58d7cf7 100644 --- a/chrome/browser/performance_monitor/database.h +++ b/chrome/browser/performance_monitor/database.h @@ -5,11 +5,11 @@ #ifndef CHROME_BROWSER_PERFORMANCE_MONITOR_DATABASE_H_ #define CHROME_BROWSER_PERFORMANCE_MONITOR_DATABASE_H_ -#include <vector> #include <set> #include <string> +#include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/performance_monitor/database_unittest.cc b/chrome/browser/performance_monitor/database_unittest.cc index 100a435..752b064 100644 --- a/chrome/browser/performance_monitor/database_unittest.cc +++ b/chrome/browser/performance_monitor/database_unittest.cc @@ -6,8 +6,8 @@ #include <string> #include <vector> -#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/memory/scoped_ptr.h" #include "base/time.h" diff --git a/chrome/browser/performance_monitor/performance_monitor.h b/chrome/browser/performance_monitor/performance_monitor.h index 0da96d3..652b4ea 100644 --- a/chrome/browser/performance_monitor/performance_monitor.h +++ b/chrome/browser/performance_monitor/performance_monitor.h @@ -9,7 +9,7 @@ #include <string> #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc index 105af28..5318242 100644 --- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc +++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #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/browser/platform_util_mac.mm b/chrome/browser/platform_util_mac.mm index 06ad9ac..083645a 100644 --- a/chrome/browser/platform_util_mac.mm +++ b/chrome/browser/platform_util_mac.mm @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> #include <CoreServices/CoreServices.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/mac/mac_logging.h" #include "base/mac/scoped_aedesc.h" diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc index 71b228f..4290009 100644 --- a/chrome/browser/platform_util_win.cc +++ b/chrome/browser/platform_util_win.cc @@ -11,8 +11,8 @@ #include "base/bind.h" #include "base/bind_helpers.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 "base/utf_string_conversions.h" diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.h b/chrome/browser/plugins/chrome_plugin_service_filter.h index bd0ffd4..74c1f7a 100644 --- a/chrome/browser/plugins/chrome_plugin_service_filter.h +++ b/chrome/browser/plugins/chrome_plugin_service_filter.h @@ -9,7 +9,7 @@ #include <set> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" diff --git a/chrome/browser/plugins/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h index ebcd50b..4b2e18b 100644 --- a/chrome/browser/plugins/plugin_prefs.h +++ b/chrome/browser/plugins/plugin_prefs.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/policy/app_pack_updater.h b/chrome/browser/policy/app_pack_updater.h index ddc3c56..4f45f63 100644 --- a/chrome/browser/policy/app_pack_updater.h +++ b/chrome/browser/policy/app_pack_updater.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/extensions/updater/extension_downloader_delegate.h" diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc index 465c5ba..bcf6d26 100644 --- a/chrome/browser/policy/browser_policy_connector.cc +++ b/chrome/browser/policy/browser_policy_connector.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/policy/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud_policy_browsertest.cc index 4e0acda..27bcab8 100644 --- a/chrome/browser/policy/cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud_policy_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #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/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/policy/config_dir_policy_loader.h b/chrome/browser/policy/config_dir_policy_loader.h index a0dcc94..afdc8e6 100644 --- a/chrome/browser/policy/config_dir_policy_loader.h +++ b/chrome/browser/policy/config_dir_policy_loader.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_POLICY_CONFIG_DIR_POLICY_LOADER_H_ #define CHROME_BROWSER_POLICY_CONFIG_DIR_POLICY_LOADER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "chrome/browser/policy/async_policy_loader.h" #include "chrome/browser/policy/policy_types.h" diff --git a/chrome/browser/policy/configuration_policy_handler.cc b/chrome/browser/policy/configuration_policy_handler.cc index aa088c3..07c20de 100644 --- a/chrome/browser/policy/configuration_policy_handler.cc +++ b/chrome/browser/policy/configuration_policy_handler.cc @@ -7,7 +7,7 @@ #include <algorithm> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/prefs/pref_value_map.h" diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc index daf6e45..2a8ac08 100644 --- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc +++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc @@ -4,7 +4,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/prefs/pref_store_observer_mock.h" diff --git a/chrome/browser/policy/enterprise_install_attributes.h b/chrome/browser/policy/enterprise_install_attributes.h index 3cf605c..2a52e08 100644 --- a/chrome/browser/policy/enterprise_install_attributes.h +++ b/chrome/browser/policy/enterprise_install_attributes.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/policy/cloud_policy_constants.h" namespace chromeos { diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 3b98fbd..57206ff 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/bind_helpers.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/memory/ref_counted.h" #include "base/path_service.h" diff --git a/chrome/browser/policy/policy_loader_mac.h b/chrome/browser/policy/policy_loader_mac.h index 61d0c2e..800491d 100644 --- a/chrome/browser/policy/policy_loader_mac.h +++ b/chrome/browser/policy/policy_loader_mac.h @@ -7,7 +7,7 @@ #include <CoreFoundation/CoreFoundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "chrome/browser/policy/async_policy_loader.h" diff --git a/chrome/browser/policy/policy_path_parser.h b/chrome/browser/policy/policy_path_parser.h index 5afc099..5bf0345 100644 --- a/chrome/browser/policy/policy_path_parser.h +++ b/chrome/browser/policy/policy_path_parser.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" namespace policy { diff --git a/chrome/browser/policy/policy_path_parser_mac.mm b/chrome/browser/policy/policy_path_parser_mac.mm index f7ad216..44b56c5 100644 --- a/chrome/browser/policy/policy_path_parser_mac.mm +++ b/chrome/browser/policy/policy_path_parser_mac.mm @@ -5,10 +5,10 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/sys_string_conversions.h" #import "base/mac/scoped_nsautorelease_pool.h" +#include "base/sys_string_conversions.h" #include "policy/policy_constants.h" #import <Cocoa/Cocoa.h> diff --git a/chrome/browser/policy/policy_path_parser_unittest.cc b/chrome/browser/policy/policy_path_parser_unittest.cc index 916b03a..4e3b3d8 100644 --- a/chrome/browser/policy/policy_path_parser_unittest.cc +++ b/chrome/browser/policy/policy_path_parser_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_path.h> -#include <chrome/browser/policy/policy_path_parser.h> +#include "base/files/file_path.h" +#include "chrome/browser/policy/policy_path_parser.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/policy/policy_prefs_browsertest.cc b/chrome/browser/policy/policy_prefs_browsertest.cc index 9751cb8..bce4fe0 100644 --- a/chrome/browser/policy/policy_prefs_browsertest.cc +++ b/chrome/browser/policy/policy_prefs_browsertest.cc @@ -9,8 +9,8 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/chrome/browser/policy/test/local_policy_test_server.h b/chrome/browser/policy/test/local_policy_test_server.h index 6370073..bc02bd9 100644 --- a/chrome/browser/policy/test/local_policy_test_server.h +++ b/chrome/browser/policy/test/local_policy_test_server.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/values.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/policy/user_cloud_policy_store.h b/chrome/browser/policy/user_cloud_policy_store.h index 79aa1b4..5b11766 100644 --- a/chrome/browser/policy/user_cloud_policy_store.h +++ b/chrome/browser/policy/user_cloud_policy_store.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/policy/user_cloud_policy_store_base.h" diff --git a/chrome/browser/policy/user_cloud_policy_store_chromeos.h b/chrome/browser/policy/user_cloud_policy_store_chromeos.h index 3679cc6..d66e09d 100644 --- a/chrome/browser/policy/user_cloud_policy_store_chromeos.h +++ b/chrome/browser/policy/user_cloud_policy_store_chromeos.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/policy/cloud_policy_validator.h" diff --git a/chrome/browser/policy/user_policy_disk_cache.h b/chrome/browser/policy/user_policy_disk_cache.h index 346b7dc..81466ef 100644 --- a/chrome/browser/policy/user_policy_disk_cache.h +++ b/chrome/browser/policy/user_policy_disk_cache.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_POLICY_USER_POLICY_DISK_CACHE_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/policy/user_policy_token_loader.h b/chrome/browser/policy/user_policy_token_loader.h index 7f32ead..86eac01 100644 --- a/chrome/browser/policy/user_policy_token_loader.h +++ b/chrome/browser/policy/user_policy_token_loader.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/popup_blocker_browsertest.cc b/chrome/browser/popup_blocker_browsertest.cc index d229ee1..151f70e 100644 --- a/chrome/browser/popup_blocker_browsertest.cc +++ b/chrome/browser/popup_blocker_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "chrome/browser/autocomplete/autocomplete_match.h" diff --git a/chrome/browser/predictors/predictor_database.cc b/chrome/browser/predictors/predictor_database.cc index 346a7d1..69e088d 100644 --- a/chrome/browser/predictors/predictor_database.cc +++ b/chrome/browser/predictors/predictor_database.cc @@ -5,11 +5,11 @@ #include "chrome/browser/predictors/predictor_database.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/stringprintf.h" #include "base/metrics/histogram.h" +#include "base/stringprintf.h" #include "chrome/browser/predictors/autocomplete_action_predictor_table.h" #include "chrome/browser/predictors/resource_prefetch_predictor.h" #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h" diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc index 505b5ea..792e2e8 100644 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc @@ -5,8 +5,8 @@ #include "chrome/browser/prefs/chrome_pref_service_factory.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/metrics/histogram.h" #include "base/prefs/default_pref_store.h" #include "base/prefs/json_pref_store.h" diff --git a/chrome/browser/prefs/pref_registry_syncable.cc b/chrome/browser/prefs/pref_registry_syncable.cc index 62e9969..3a34360 100644 --- a/chrome/browser/prefs/pref_registry_syncable.cc +++ b/chrome/browser/prefs/pref_registry_syncable.cc @@ -4,7 +4,7 @@ #include "chrome/browser/prefs/pref_registry_syncable.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/default_pref_store.h" #include "base/string_number_conversions.h" #include "base/values.h" diff --git a/chrome/browser/prefs/pref_service_syncable.cc b/chrome/browser/prefs/pref_service_syncable.cc index 5d26e17..01db256 100644 --- a/chrome/browser/prefs/pref_service_syncable.cc +++ b/chrome/browser/prefs/pref_service_syncable.cc @@ -5,7 +5,7 @@ #include "chrome/browser/prefs/pref_service_syncable.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/default_pref_store.h" #include "base/prefs/overlay_user_pref_store.h" #include "base/prefs/pref_notifier_impl.h" diff --git a/chrome/browser/printing/print_dialog_cloud_interative_uitest.cc b/chrome/browser/printing/print_dialog_cloud_interative_uitest.cc index c2dfee7..709f544 100644 --- a/chrome/browser/printing/print_dialog_cloud_interative_uitest.cc +++ b/chrome/browser/printing/print_dialog_cloud_interative_uitest.cc @@ -8,8 +8,8 @@ #include <functional> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/path_service.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/printing/print_dialog_cloud_internal.h b/chrome/browser/printing/print_dialog_cloud_internal.h index 3c4ec0d..3e7cc9a 100644 --- a/chrome/browser/printing/print_dialog_cloud_internal.h +++ b/chrome/browser/printing/print_dialog_cloud_internal.h @@ -9,7 +9,7 @@ #include <vector> #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/printing/print_dialog_cloud_unittest.cc b/chrome/browser/printing/print_dialog_cloud_unittest.cc index 23d702d..6aff2c7 100644 --- a/chrome/browser/printing/print_dialog_cloud_unittest.cc +++ b/chrome/browser/printing/print_dialog_cloud_unittest.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/printing/print_dialog_gtk.h b/chrome/browser/printing/print_dialog_gtk.h index 587576e..06a14c7 100644 --- a/chrome/browser/printing/print_dialog_gtk.h +++ b/chrome/browser/printing/print_dialog_gtk.h @@ -9,7 +9,7 @@ #include <gtk/gtkunixprint.h> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner_helpers.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/printing/printer_manager_dialog_win.cc b/chrome/browser/printing/printer_manager_dialog_win.cc index a1c0442..5e71976 100644 --- a/chrome/browser/printing/printer_manager_dialog_win.cc +++ b/chrome/browser/printing/printer_manager_dialog_win.cc @@ -8,7 +8,7 @@ #include <shellapi.h> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/threading/thread.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc index 278a7f6..73053ac 100644 --- a/chrome/browser/printing/printing_layout_browsertest.cc +++ b/chrome/browser/printing/printing_layout_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/process_util.h" @@ -17,9 +17,9 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/process_info_snapshot_mac_unittest.cc b/chrome/browser/process_info_snapshot_mac_unittest.cc index f6cf7b1..980dc91 100644 --- a/chrome/browser/process_info_snapshot_mac_unittest.cc +++ b/chrome/browser/process_info_snapshot_mac_unittest.cc @@ -10,7 +10,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/process_util.h" diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h index 12ed1ab..0cded79 100644 --- a/chrome/browser/process_singleton.h +++ b/chrome/browser/process_singleton.h @@ -17,7 +17,7 @@ #include "base/basictypes.h" #include "base/callback.h" #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/process.h" diff --git a/chrome/browser/process_singleton_browsertest.cc b/chrome/browser/process_singleton_browsertest.cc index 9cb284c..82a6aa5 100644 --- a/chrome/browser/process_singleton_browsertest.cc +++ b/chrome/browser/process_singleton_browsertest.cc @@ -12,8 +12,8 @@ #include "base/bind.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/memory/ref_counted.h" #include "base/path_service.h" diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index a077861..fecbda9 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -59,8 +59,8 @@ #include "base/basictypes.h" #include "base/bind.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/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/process_singleton_linux_unittest.cc b/chrome/browser/process_singleton_linux_unittest.cc index a922e6e..33102ab 100644 --- a/chrome/browser/process_singleton_linux_unittest.cc +++ b/chrome/browser/process_singleton_linux_unittest.cc @@ -14,7 +14,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/process_util.h" diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc index 62d3814..5f83a22 100644 --- a/chrome/browser/process_singleton_win.cc +++ b/chrome/browser/process_singleton_win.cc @@ -9,7 +9,7 @@ #include "base/base_paths.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/stringprintf.h" diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index 7baff3e..48cd3b1 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.h b/chrome/browser/profiles/off_the_record_profile_io_data.h index c4e3f8e..ed37d48 100644 --- a/chrome/browser/profiles/off_the_record_profile_io_data.h +++ b/chrome/browser/profiles/off_the_record_profile_io_data.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 9f6685e..b41fea5 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -9,8 +9,8 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h index 748ce2a..7ffa968 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h @@ -9,7 +9,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/profiles/profile_info_cache.h b/chrome/browser/profiles/profile_info_cache.h index 7a0398c..82545fd 100644 --- a/chrome/browser/profiles/profile_info_cache.h +++ b/chrome/browser/profiles/profile_info_cache.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/string16.h" diff --git a/chrome/browser/profiles/profile_info_interface.h b/chrome/browser/profiles/profile_info_interface.h index 9eabe05..4e3ed99 100644 --- a/chrome/browser/profiles/profile_info_interface.h +++ b/chrome/browser/profiles/profile_info_interface.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_INFO_INTERFACE_H_ #define CHROME_BROWSER_PROFILES_PROFILE_INFO_INTERFACE_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" namespace gfx { diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h index 39c9c3b..c3baef0 100644 --- a/chrome/browser/profiles/profile_io_data.h +++ b/chrome/browser/profiles/profile_io_data.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index ac9191f..c08f9a1 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h index 8014d58..72510d9 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h @@ -11,7 +11,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/hash_tables.h" #include "base/memory/linked_ptr.h" diff --git a/chrome/browser/profiles/profile_metrics.cc b/chrome/browser/profiles/profile_metrics.cc index d1fb890..2e76e06 100644 --- a/chrome/browser/profiles/profile_metrics.cc +++ b/chrome/browser/profiles/profile_metrics.cc @@ -4,7 +4,7 @@ #include "chrome/browser/profiles/profile_metrics.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/profiles/profile_shortcut_manager.h b/chrome/browser/profiles/profile_shortcut_manager.h index dc814b1..e947b62 100644 --- a/chrome/browser/profiles/profile_shortcut_manager.h +++ b/chrome/browser/profiles/profile_shortcut_manager.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/profiles/storage_partition_descriptor.h b/chrome/browser/profiles/storage_partition_descriptor.h index e57e6c7..39bc769 100644 --- a/chrome/browser/profiles/storage_partition_descriptor.h +++ b/chrome/browser/profiles/storage_partition_descriptor.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PROFILES_STORAGE_PARTITION_DESCRIPTOR_H_ #define CHROME_BROWSER_PROFILES_STORAGE_PARTITION_DESCRIPTOR_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" // This structure combines a StoragePartition's on-disk path and a boolean for diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.h b/chrome/browser/renderer_host/chrome_render_message_filter.h index 1aa149e..b662517 100644 --- a/chrome/browser/renderer_host/chrome_render_message_filter.h +++ b/chrome/browser/renderer_host/chrome_render_message_filter.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc index 037985c..00ab995 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/waitable_event.h" diff --git a/chrome/browser/safe_browsing/download_protection_service.h b/chrome/browser/safe_browsing/download_protection_service.h index 8bd6696..0e42884 100644 --- a/chrome/browser/safe_browsing/download_protection_service.h +++ b/chrome/browser/safe_browsing/download_protection_service.h @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "chrome/browser/safe_browsing/database_manager.h" diff --git a/chrome/browser/safe_browsing/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection_service_unittest.cc index 5af784c..66703fa 100644 --- a/chrome/browser/safe_browsing/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection_service_unittest.cc @@ -10,8 +10,8 @@ #include "base/base_paths.h" #include "base/bind.h" #include "base/callback.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/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/safe_browsing/local_safebrowsing_test_server.h b/chrome/browser/safe_browsing/local_safebrowsing_test_server.h index 719344e..e2515ae 100644 --- a/chrome/browser/safe_browsing/local_safebrowsing_test_server.h +++ b/chrome/browser/safe_browsing/local_safebrowsing_test_server.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "net/test/local_test_server.h" // Runs a Python-based safebrowsing test server on the same machine in which the diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h index 576361c..27a7f8f 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.h +++ b/chrome/browser/safe_browsing/safe_browsing_database.h @@ -8,7 +8,7 @@ #include <set> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h index 9d09b33..4e6fcdd4 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.h +++ b/chrome/browser/safe_browsing/safe_browsing_service.h @@ -12,7 +12,7 @@ #include <string> #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index 75739ad..16745d6 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" diff --git a/chrome/browser/safe_browsing/sandboxed_zip_analyzer.h b/chrome/browser/safe_browsing/sandboxed_zip_analyzer.h index 4d4ac14..5936bc0 100644 --- a/chrome/browser/safe_browsing/sandboxed_zip_analyzer.h +++ b/chrome/browser/safe_browsing/sandboxed_zip_analyzer.h @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" #include "content/public/browser/utility_process_host.h" diff --git a/chrome/browser/safe_browsing/signature_util_win.cc b/chrome/browser/safe_browsing/signature_util_win.cc index a4cf6a8..b512fca 100644 --- a/chrome/browser/safe_browsing/signature_util_win.cc +++ b/chrome/browser/safe_browsing/signature_util_win.cc @@ -8,7 +8,7 @@ #include <softpub.h> #include <wintrust.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "chrome/common/safe_browsing/csd.pb.h" diff --git a/chrome/browser/safe_browsing/signature_util_win_unittest.cc b/chrome/browser/safe_browsing/signature_util_win_unittest.cc index 8127e54..b6fb491 100644 --- a/chrome/browser/safe_browsing/signature_util_win_unittest.cc +++ b/chrome/browser/safe_browsing/signature_util_win_unittest.cc @@ -8,9 +8,9 @@ #include <vector> #include "base/base_paths.h" -#include "base/file_path.h" -#include "base/path_service.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" +#include "base/path_service.h" #include "chrome/common/safe_browsing/csd.pb.h" #include "net/base/x509_cert_types.h" #include "net/base/x509_certificate.h" diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc index 94666b9..3f7b384 100644 --- a/chrome/browser/service/service_process_control.cc +++ b/chrome/browser/service/service_process_control.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process_util.h" #include "base/stl_util.h" #include "base/threading/thread.h" diff --git a/chrome/browser/sessions/base_session_service.h b/chrome/browser/sessions/base_session_service.h index d0fde8d..1d3fac2 100644 --- a/chrome/browser/sessions/base_session_service.h +++ b/chrome/browser/sessions/base_session_service.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/location.h" #include "base/memory/ref_counted.h" diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc index fa11e34..ea8df12 100644 --- a/chrome/browser/sessions/better_session_restore_browsertest.cc +++ b/chrome/browser/sessions/better_session_restore_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #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/path_service.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/sessions/persistent_tab_restore_service.cc b/chrome/browser/sessions/persistent_tab_restore_service.cc index 65cd91f..b8f704b 100644 --- a/chrome/browser/sessions/persistent_tab_restore_service.cc +++ b/chrome/browser/sessions/persistent_tab_restore_service.cc @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 5106ac9..5eae0aa 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc index fb8bf52..d57e6c1 100644 --- a/chrome/browser/sessions/tab_restore_browsertest.cc +++ b/chrome/browser/sessions/tab_restore_browsertest.cc @@ -4,7 +4,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/test/test_timeouts.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h index 6374ee2..a3e897c 100644 --- a/chrome/browser/shell_integration.h +++ b/chrome/browser/shell_integration.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/string16.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc index a42f16e..a97a072 100644 --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc @@ -17,8 +17,8 @@ #include "base/base_paths.h" #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/files/scoped_temp_dir.h" #include "base/i18n/file_util_icu.h" #include "base/message_loop.h" diff --git a/chrome/browser/shell_integration_linux.h b/chrome/browser/shell_integration_linux.h index 50a4845..519895c 100644 --- a/chrome/browser/shell_integration_linux.h +++ b/chrome/browser/shell_integration_linux.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/shell_integration.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc index 25acceb..39ca70a 100644 --- a/chrome/browser/shell_integration_unittest.cc +++ b/chrome/browser/shell_integration_unittest.cc @@ -7,8 +7,8 @@ #include <cstdlib> #include <map> -#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/message_loop.h" #include "base/stl_util.h" diff --git a/chrome/browser/shell_integration_win_unittest.cc b/chrome/browser/shell_integration_win_unittest.cc index 56b7ae2..04b600d 100644 --- a/chrome/browser/shell_integration_win_unittest.cc +++ b/chrome/browser/shell_integration_win_unittest.cc @@ -6,8 +6,8 @@ #include <vector> -#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/strings/string_number_conversions.h" #include "base/test/test_shortcut_win.h" diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary.h b/chrome/browser/spellchecker/spellcheck_custom_dictionary.h index a8c9c83..3854156 100644 --- a/chrome/browser/spellchecker/spellcheck_custom_dictionary.h +++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h index 253f05c..9100849 100644 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h @@ -7,7 +7,7 @@ #include "chrome/browser/spellchecker/spellcheck_dictionary.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" diff --git a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc index d24e808..c2fd114 100644 --- a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc +++ b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ssl/ssl_client_certificate_selector_test.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/storage_monitor/disk_info_mac.h b/chrome/browser/storage_monitor/disk_info_mac.h index b362ecd..332d087 100644 --- a/chrome/browser/storage_monitor/disk_info_mac.h +++ b/chrome/browser/storage_monitor/disk_info_mac.h @@ -7,7 +7,7 @@ #include <CoreFoundation/CoreFoundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/storage_monitor/media_storage_util.h" namespace chrome { diff --git a/chrome/browser/storage_monitor/image_capture_device.h b/chrome/browser/storage_monitor/image_capture_device.h index 32b3727..6fc03fc 100644 --- a/chrome/browser/storage_monitor/image_capture_device.h +++ b/chrome/browser/storage_monitor/image_capture_device.h @@ -8,7 +8,7 @@ #import <Foundation/Foundation.h> #import <ImageCaptureCore/ImageCaptureCore.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/cocoa_protocols.h" #include "base/mac/foundation_util.h" #include "base/memory/ref_counted.h" diff --git a/chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm b/chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm index 8d3700d..683b98d 100644 --- a/chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm +++ b/chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm @@ -6,8 +6,8 @@ #import <Foundation/Foundation.h> #import <ImageCaptureCore/ImageCaptureCore.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/mac/foundation_util.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/storage_monitor/media_device_notifications_utils.h b/chrome/browser/storage_monitor/media_device_notifications_utils.h index 4bf61cd..31835fb 100644 --- a/chrome/browser/storage_monitor/media_device_notifications_utils.h +++ b/chrome/browser/storage_monitor/media_device_notifications_utils.h @@ -7,7 +7,7 @@ #ifndef CHROME_BROWSER_STORAGE_MONITOR_MEDIA_DEVICE_NOTIFICATIONS_UTILS_H_ #define CHROME_BROWSER_STORAGE_MONITOR_MEDIA_DEVICE_NOTIFICATIONS_UTILS_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" namespace chrome { diff --git a/chrome/browser/storage_monitor/media_device_notifications_utils_unittest.cc b/chrome/browser/storage_monitor/media_device_notifications_utils_unittest.cc index f4b0ce4..90db5a4 100644 --- a/chrome/browser/storage_monitor/media_device_notifications_utils_unittest.cc +++ b/chrome/browser/storage_monitor/media_device_notifications_utils_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/storage_monitor/media_device_notifications_utils.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/message_loop.h" #include "chrome/browser/storage_monitor/removable_device_constants.h" diff --git a/chrome/browser/storage_monitor/media_storage_util.h b/chrome/browser/storage_monitor/media_storage_util.h index 092a2e9..a914810 100644 --- a/chrome/browser/storage_monitor/media_storage_util.h +++ b/chrome/browser/storage_monitor/media_storage_util.h @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace chrome { diff --git a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc index f510033..cfa7a93 100644 --- a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc +++ b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc @@ -4,7 +4,7 @@ #include "chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stl_util.h" #include "base/string_split.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/storage_monitor/portable_device_watcher_win.cc b/chrome/browser/storage_monitor/portable_device_watcher_win.cc index 65626ec..6275349 100644 --- a/chrome/browser/storage_monitor/portable_device_watcher_win.cc +++ b/chrome/browser/storage_monitor/portable_device_watcher_win.cc @@ -11,7 +11,7 @@ #include <dbt.h> #include <portabledevice.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/stl_util.h" #include "base/string_util.h" diff --git a/chrome/browser/storage_monitor/removable_device_constants.h b/chrome/browser/storage_monitor/removable_device_constants.h index f68847b..7d32c9b 100644 --- a/chrome/browser/storage_monitor/removable_device_constants.h +++ b/chrome/browser/storage_monitor/removable_device_constants.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_STORAGE_MONITOR_REMOVABLE_DEVICE_CONSTANTS_H_ #define CHROME_BROWSER_STORAGE_MONITOR_REMOVABLE_DEVICE_CONSTANTS_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "build/build_config.h" diff --git a/chrome/browser/storage_monitor/removable_device_notifications_chromeos.cc b/chrome/browser/storage_monitor/removable_device_notifications_chromeos.cc index 4b14c35..7c679ce 100644 --- a/chrome/browser/storage_monitor/removable_device_notifications_chromeos.cc +++ b/chrome/browser/storage_monitor/removable_device_notifications_chromeos.cc @@ -6,7 +6,7 @@ #include "chrome/browser/storage_monitor/removable_device_notifications_chromeos.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/stl_util.h" #include "base/string_util.h" diff --git a/chrome/browser/storage_monitor/removable_device_notifications_linux.cc b/chrome/browser/storage_monitor/removable_device_notifications_linux.cc index ab541d6..ee62aea 100644 --- a/chrome/browser/storage_monitor/removable_device_notifications_linux.cc +++ b/chrome/browser/storage_monitor/removable_device_notifications_linux.cc @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/metrics/histogram.h" #include "base/stl_util.h" #include "base/string_util.h" diff --git a/chrome/browser/storage_monitor/removable_storage_notifications.h b/chrome/browser/storage_monitor/removable_storage_notifications.h index 49e67b2..d31e0eb 100644 --- a/chrome/browser/storage_monitor/removable_storage_notifications.h +++ b/chrome/browser/storage_monitor/removable_storage_notifications.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_STORAGE_MONITOR_REMOVABLE_STORAGE_NOTIFICATIONS_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/observer_list_threadsafe.h" #include "base/string16.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc b/chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc index 5dd1d80..657d39c 100644 --- a/chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc +++ b/chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc @@ -7,7 +7,7 @@ #include "chrome/browser/storage_monitor/test_volume_mount_watcher_win.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace chrome { namespace test { diff --git a/chrome/browser/storage_monitor/udev_util_linux.cc b/chrome/browser/storage_monitor/udev_util_linux.cc index e72640d..e6c62ba 100644 --- a/chrome/browser/storage_monitor/udev_util_linux.cc +++ b/chrome/browser/storage_monitor/udev_util_linux.cc @@ -4,7 +4,7 @@ #include "chrome/browser/storage_monitor/udev_util_linux.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace chrome { diff --git a/chrome/browser/storage_monitor/volume_mount_watcher_win.h b/chrome/browser/storage_monitor/volume_mount_watcher_win.h index efe2938..7e74671 100644 --- a/chrome/browser/storage_monitor/volume_mount_watcher_win.h +++ b/chrome/browser/storage_monitor/volume_mount_watcher_win.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/string16.h" #include "base/threading/sequenced_worker_pool.h" diff --git a/chrome/browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc b/chrome/browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc index 6fd4dd3..27b3e91 100644 --- a/chrome/browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc +++ b/chrome/browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync/glue/chrome_extensions_activity_monitor.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/values.h" diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc index e689d6d..158ae2e 100644 --- a/chrome/browser/sync/glue/sync_backend_host.cc +++ b/chrome/browser/sync/glue/sync_backend_host.cc @@ -12,8 +12,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/metrics/histogram.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc index 311299c..5e4e1dc 100644 --- a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc +++ b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc @@ -5,7 +5,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "chrome/browser/sync/glue/data_type_controller.h" diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc index 337b928..7016715 100644 --- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc @@ -12,8 +12,8 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/chrome/browser/sync/test/integration/preferences_helper.h b/chrome/browser/sync/test/integration/preferences_helper.h index a8144ca..ac122e6 100644 --- a/chrome/browser/sync/test/integration/preferences_helper.h +++ b/chrome/browser/sync/test/integration/preferences_helper.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_PREFERENCES_HELPER_H_ #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_PREFERENCES_HELPER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/values.h" #include <string> diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc index fe61af5..0175a9c 100644 --- a/chrome/browser/sync/test/integration/sync_extension_helper.cc +++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc @@ -4,8 +4,8 @@ #include "chrome/browser/sync/test/integration/sync_extension_helper.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/sync_file_system/drive_metadata_store.cc b/chrome/browser/sync_file_system/drive_metadata_store.cc index 22706b4..8c1f5ff 100644 --- a/chrome/browser/sync_file_system/drive_metadata_store.cc +++ b/chrome/browser/sync_file_system/drive_metadata_store.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/message_loop_proxy.h" #include "base/sequenced_task_runner.h" diff --git a/chrome/browser/sync_file_system/drive_metadata_store.h b/chrome/browser/sync_file_system/drive_metadata_store.h index 8b818c9..a04af40 100644 --- a/chrome/browser/sync_file_system/drive_metadata_store.h +++ b/chrome/browser/sync_file_system/drive_metadata_store.h @@ -10,7 +10,7 @@ #include <vector> #include "base/callback_forward.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/weak_ptr.h" diff --git a/chrome/browser/sync_file_system/drive_metadata_store_unittest.cc b/chrome/browser/sync_file_system/drive_metadata_store_unittest.cc index c28024b..ebdc415 100644 --- a/chrome/browser/sync_file_system/drive_metadata_store_unittest.cc +++ b/chrome/browser/sync_file_system/drive_metadata_store_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync_file_system/drive_metadata_store.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/single_thread_task_runner.h" diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index d3341f2..2951ceb 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/task_manager/task_manager.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" diff --git a/chrome/browser/task_profiler/auto_tracking.h b/chrome/browser/task_profiler/auto_tracking.h index 343f8f65..5c88fad 100644 --- a/chrome/browser/task_profiler/auto_tracking.h +++ b/chrome/browser/task_profiler/auto_tracking.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_TASK_PROFILER_AUTO_TRACKING_H_ #define CHROME_BROWSER_TASK_PROFILER_AUTO_TRACKING_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/tracked_objects.h" //------------------------------------------------------------------------------ diff --git a/chrome/browser/task_profiler/task_profiler_data_serializer.cc b/chrome/browser/task_profiler/task_profiler_data_serializer.cc index ed9440f..fcef2ae 100644 --- a/chrome/browser/task_profiler/task_profiler_data_serializer.cc +++ b/chrome/browser/task_profiler/task_profiler_data_serializer.cc @@ -4,8 +4,8 @@ #include "chrome/browser/task_profiler/task_profiler_data_serializer.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_string_value_serializer.h" #include "base/time.h" #include "base/tracked_objects.h" diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc index 2d268cc..dc84d56 100644 --- a/chrome/browser/themes/theme_syncable_service_unittest.cc +++ b/chrome/browser/themes/theme_syncable_service_unittest.cc @@ -6,20 +6,20 @@ #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" -#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/extension.h" +#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" -#include "sync/api/sync_error_factory_mock.h" #include "sync/api/sync_error.h" +#include "sync/api/sync_error_factory_mock.h" #include "sync/protocol/sync.pb.h" #include "sync/protocol/theme_specifics.pb.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/app_list/app_list_util.h b/chrome/browser/ui/app_list/app_list_util.h index 789eeea..41ac242 100644 --- a/chrome/browser/ui/app_list/app_list_util.h +++ b/chrome/browser/ui/app_list/app_list_util.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_UTIL_H_ #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_UTIL_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" class PrefRegistrySimple; class Profile; diff --git a/chrome/browser/ui/app_list/apps_model_builder_unittest.cc b/chrome/browser/ui/app_list/apps_model_builder_unittest.cc index 01b1daa..af154d2 100644 --- a/chrome/browser/ui/app_list/apps_model_builder_unittest.cc +++ b/chrome/browser/ui/app_list/apps_model_builder_unittest.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service_unittest.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc index d790fc6..8f8d23e 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc @@ -11,7 +11,7 @@ #include "ash/launcher/launcher_model.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc index cbd84fa..d8f89a0 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc @@ -11,7 +11,7 @@ #include "ash/launcher/launcher_model.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/values.h" diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc index 4e82bc1..9ca03c1 100644 --- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc @@ -6,7 +6,7 @@ #include "ash/ash_switches.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "base/time.h" #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h" diff --git a/chrome/browser/ui/ash/screenshot_taker.cc b/chrome/browser/ui/ash/screenshot_taker.cc index 8d38b4b..52182d6 100644 --- a/chrome/browser/ui/ash/screenshot_taker.cc +++ b/chrome/browser/ui/ash/screenshot_taker.cc @@ -11,8 +11,8 @@ #include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/stringprintf.h" diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 3908a6a..40215ab 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/pref_service.h" #include "base/sys_info.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/chrome_select_file_policy_unittest.cc b/chrome/browser/ui/chrome_select_file_policy_unittest.cc index 9a1bb2c..d5a6c10 100644 --- a/chrome/browser/ui/chrome_select_file_policy_unittest.cc +++ b/chrome/browser/ui/chrome_select_file_policy_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/ui/chrome_select_file_policy.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/prefs/pref_service.h" #include "base/string16.h" diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm index 9e16e05..7bf0063 100644 --- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/applescript/tab_applescript.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #import "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h b/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h index e8c61ea..a91db0d 100644 --- a/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h +++ b/chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h @@ -9,7 +9,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chrome_to_mobile_service.h" diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm index 8f1c603..f408c55 100644 --- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm +++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #import "base/mac/foundation_util.h" #include "base/native_library.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_button.h b/chrome/browser/ui/cocoa/download/download_item_button.h index a4af812..ecc2ee3 100644 --- a/chrome/browser/ui/cocoa/download/download_item_button.h +++ b/chrome/browser/ui/cocoa/download/download_item_button.h @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #import "chrome/browser/ui/cocoa/draggable_button.h" @class DownloadItemController; diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.h b/chrome/browser/ui/cocoa/download/download_item_cell.h index 0284012..c73f9c8 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.h +++ b/chrome/browser/ui/cocoa/download/download_item_cell.h @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/gradient_button_cell.h" -#include "base/file_path.h" +#include "base/files/file_path.h" class DownloadItemModel; @class IndeterminateProgressTimer; diff --git a/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm b/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm index f97cddf..f2cc313 100644 --- a/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/download/download_util_mac_unittest.mm @@ -4,7 +4,7 @@ // Download utility test for Mac OS X. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/drag_util.mm b/chrome/browser/ui/cocoa/drag_util.mm index b79db4d..98a9d5f 100644 --- a/chrome/browser/ui/cocoa/drag_util.mm +++ b/chrome/browser/ui/cocoa/drag_util.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/drag_util.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/plugin_service.h" #include "content/public/common/url_constants.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm index d9a3a1b..bfc82e4 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm @@ -4,8 +4,8 @@ #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm index 495ca2d..2f93349 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm @@ -4,8 +4,8 @@ #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm index 14c81fe..6c150bf 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm @@ -6,8 +6,8 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/values.h" diff --git a/chrome/browser/ui/extensions/application_launch.h b/chrome/browser/ui/extensions/application_launch.h index 75ca97d..09230cf 100644 --- a/chrome/browser/ui/extensions/application_launch.h +++ b/chrome/browser/ui/extensions/application_launch.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_EXTENSIONS_APPLICATION_LAUNCH_H_ #define CHROME_BROWSER_UI_EXTENSIONS_APPLICATION_LAUNCH_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/common/extensions/extension_constants.h" #include "googleurl/src/gurl.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.h b/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.h index 3c5f10f..fcb5eea 100644 --- a/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.h +++ b/chrome/browser/ui/gtk/chrome_to_mobile_bubble_gtk.h @@ -16,7 +16,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chrome_to_mobile_service.h" diff --git a/chrome/browser/ui/gtk/custom_drag.cc b/chrome/browser/ui/gtk/custom_drag.cc index ed48990..f813ba2 100644 --- a/chrome/browser/ui/gtk/custom_drag.cc +++ b/chrome/browser/ui/gtk/custom_drag.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/gtk/custom_drag.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" #include "content/public/browser/download_item.h" diff --git a/chrome/browser/ui/hung_plugin_tab_helper.h b/chrome/browser/ui/hung_plugin_tab_helper.h index 51feb42..eb37379 100644 --- a/chrome/browser/ui/hung_plugin_tab_helper.h +++ b/chrome/browser/ui/hung_plugin_tab_helper.h @@ -7,7 +7,7 @@ #include <map> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/linked_ptr.h" #include "base/string16.h" #include "base/time.h" diff --git a/chrome/browser/ui/metro_pin_tab_helper_win.cc b/chrome/browser/ui/metro_pin_tab_helper_win.cc index 93a5828..f5078f3 100644 --- a/chrome/browser/ui/metro_pin_tab_helper_win.cc +++ b/chrome/browser/ui/metro_pin_tab_helper_win.cc @@ -8,8 +8,8 @@ #include "base/base_paths.h" #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" diff --git a/chrome/browser/ui/network_profile_bubble.cc b/chrome/browser/ui/network_profile_bubble.cc index aa09b14..3fcdbab 100644 --- a/chrome/browser/ui/network_profile_bubble.cc +++ b/chrome/browser/ui/network_profile_bubble.cc @@ -12,8 +12,8 @@ #include "base/bind.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/metrics/histogram.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index 8239f22..ff86e6f 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -12,7 +12,7 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/environment.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator.h b/chrome/browser/ui/startup/startup_browser_creator.h index 91da5e4..07652c1 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.h +++ b/chrome/browser/ui/startup/startup_browser_creator.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc index 6e32f48..933a7ac 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/pref_service.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.h b/chrome/browser/ui/startup/startup_browser_creator_impl.h index 4a0905c..91c1edf 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.h +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "chrome/browser/ui/startup/startup_tab.h" #include "chrome/browser/ui/startup/startup_types.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc index 9b906ae..77da246 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc @@ -5,7 +5,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/session_startup_pref.h" diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc index 0a0b962..981293d 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc @@ -7,8 +7,8 @@ #include <map> #include <string> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/stl_util.h" diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.h b/chrome/browser/ui/toolbar/wrench_menu_model.h index b78ab62..72acf00 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.h +++ b/chrome/browser/ui/toolbar/wrench_menu_model.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "content/public/browser/host_zoom_map.h" diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index accf174..fbec838 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/break_iterator.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/ui/views/find_bar_controller_browsertest.cc b/chrome/browser/ui/views/find_bar_controller_browsertest.cc index 9d65b95..a4171d7 100644 --- a/chrome/browser/ui/views/find_bar_controller_browsertest.cc +++ b/chrome/browser/ui/views/find_bar_controller_browsertest.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ui/find_bar/find_bar_controller.h" -#include "base/file_path.h" -#include "chrome/browser/ui/browser_commands.h" +#include "base/files/file_path.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/find_bar/find_bar_host_unittest_util.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc b/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc index 635031f..1383534 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/select_file_dialog_extension.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/shell_dialogs/selected_file_info.h" diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc index 8bb9c44..85f161b 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc @@ -3,15 +3,15 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/views/ssl_client_certificate_selector.h" -#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" diff --git a/chrome/browser/ui/views/user_data_dir_dialog_view.h b/chrome/browser/ui/views/user_data_dir_dialog_view.h index 2902c6e8..0355e30 100644 --- a/chrome/browser/ui/views/user_data_dir_dialog_view.h +++ b/chrome/browser/ui/views/user_data_dir_dialog_view.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "ui/shell_dialogs/select_file_dialog.h" #include "ui/views/window/dialog_delegate.h" diff --git a/chrome/browser/ui/views/web_dialog_view_browsertest.cc b/chrome/browser/ui/views/web_dialog_view_browsertest.cc index 9b72c9e..37fe1c7 100644 --- a/chrome/browser/ui/views/web_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/web_dialog_view_browsertest.cc @@ -4,7 +4,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc index 9bbd3b4..c509cdf 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/rtl.h" #include "base/string16.h" #include "base/utf_string_conversions.h" @@ -17,9 +17,9 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "content/public/browser/web_ui_message_handler.h" +#include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" -#include "googleurl/src/gurl.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" diff --git a/chrome/browser/ui/webui/extensions/install_extension_handler.h b/chrome/browser/ui/webui/extensions/install_extension_handler.h index c029d9a..2795bdc 100644 --- a/chrome/browser/ui/webui/extensions/install_extension_handler.h +++ b/chrome/browser/ui/webui/extensions/install_extension_handler.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_INSTALL_EXTENSION_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_INSTALL_EXTENSION_HANDLER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/values.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc index af8135a..b0d4609 100644 --- a/chrome/browser/ui/webui/fileicon_source.cc +++ b/chrome/browser/ui/webui/fileicon_source.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" #include "base/string_split.h" diff --git a/chrome/browser/ui/webui/fileicon_source.h b/chrome/browser/ui/webui/fileicon_source.h index ce8e54c..dc50207 100644 --- a/chrome/browser/ui/webui/fileicon_source.h +++ b/chrome/browser/ui/webui/fileicon_source.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/icon_manager.h" #include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 16bc518..e86d541 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -14,8 +14,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/platform_file.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index fb97774..c88584d 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/prerender/prerender_manager.h" diff --git a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc index 522acaf..954a875a 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/web_ui_browsertest.h" diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc index 48dd6c9..ca04485 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_x11.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/nix/xdg_util.h" #include "base/process_util.h" #include "base/string_util.h" diff --git a/chrome/browser/ui/webui/print_preview/sticky_settings.cc b/chrome/browser/ui/webui/print_preview/sticky_settings.cc index 1203db6..e487e83 100644 --- a/chrome/browser/ui/webui/print_preview/sticky_settings.cc +++ b/chrome/browser/ui/webui/print_preview/sticky_settings.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/prefs/pref_registry_syncable.h" diff --git a/chrome/browser/ui/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc index 30f7123..19e8003 100644 --- a/chrome/browser/ui/webui/screenshot_source.cc +++ b/chrome/browser/ui/webui/screenshot_source.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/time_formatting.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc index 3934b9d..d359197 100644 --- a/chrome/browser/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector_impl.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/build_time.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/metrics/field_trial.h" diff --git a/chrome/browser/user_style_sheet_watcher.h b/chrome/browser/user_style_sheet_watcher.h index 4fae4b1..baad82d 100644 --- a/chrome/browser/user_style_sheet_watcher.h +++ b/chrome/browser/user_style_sheet_watcher.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_USER_STYLE_SHEET_WATCHER_H_ #define CHROME_BROWSER_USER_STYLE_SHEET_WATCHER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/value_store/leveldb_value_store.h b/chrome/browser/value_store/leveldb_value_store.h index 95ae6dc..da8edbc 100644 --- a/chrome/browser/value_store/leveldb_value_store.h +++ b/chrome/browser/value_store/leveldb_value_store.h @@ -9,7 +9,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/value_store/value_store.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" diff --git a/chrome/browser/value_store/value_store_frontend.cc b/chrome/browser/value_store/value_store_frontend.cc index aca3fff..e53e1d1 100644 --- a/chrome/browser/value_store/value_store_frontend.cc +++ b/chrome/browser/value_store/value_store_frontend.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/debug/trace_event.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "chrome/browser/value_store/leveldb_value_store.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/web_applications/web_app.h b/chrome/browser/web_applications/web_app.h index deab896..ced6064 100644 --- a/chrome/browser/web_applications/web_app.h +++ b/chrome/browser/web_applications/web_app.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "build/build_config.h" #include "chrome/browser/shell_integration.h" #include "chrome/common/web_apps.h" diff --git a/chrome/browser/web_applications/web_app_mac.h b/chrome/browser/web_applications/web_app_mac.h index 5e06cdc..177142a 100644 --- a/chrome/browser/web_applications/web_app_mac.h +++ b/chrome/browser/web_applications/web_app_mac.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_MAC_H_ #define CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_MAC_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/string16.h" #include "chrome/browser/shell_integration.h" diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc index 2a8c082..0bd1c01 100644 --- a/chrome/browser/web_applications/web_app_unittest.cc +++ b/chrome/browser/web_applications/web_app_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/web_applications/web_app.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/tab_helper.h" diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h index ed80d76..07048fc 100644 --- a/chrome/browser/webdata/web_data_service.h +++ b/chrome/browser/webdata/web_data_service.h @@ -14,7 +14,7 @@ #include <vector> #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner_helpers.h" diff --git a/chrome/browser/webdata/web_data_service_factory.cc b/chrome/browser/webdata/web_data_service_factory.cc index 5d641d7..8c6e03f 100644 --- a/chrome/browser/webdata/web_data_service_factory.cc +++ b/chrome/browser/webdata/web_data_service_factory.cc @@ -4,7 +4,7 @@ #include "chrome/browser/webdata/web_data_service_factory.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/webdata/autofill_web_data_service_impl.h" #include "chrome/browser/webdata/web_data_service.h" diff --git a/chrome/common/auto_start_linux.cc b/chrome/common/auto_start_linux.cc index d212aaf..bc8b666 100644 --- a/chrome/common/auto_start_linux.cc +++ b/chrome/common/auto_start_linux.cc @@ -5,8 +5,8 @@ #include "chrome/common/auto_start_linux.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/nix/xdg_util.h" #include "base/strings/string_tokenizer.h" diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc index c06d0b8..7a67f83 100644 --- a/chrome/common/chrome_constants.cc +++ b/chrome/common/chrome_constants.cc @@ -4,7 +4,7 @@ #include "chrome/common/chrome_constants.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #define FPL FILE_PATH_LITERAL diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h index c236c3c..40feb7c 100644 --- a/chrome/common/chrome_constants.h +++ b/chrome/common/chrome_constants.h @@ -7,7 +7,7 @@ #ifndef CHROME_COMMON_CHROME_CONSTANTS_H_ #define CHROME_COMMON_CHROME_CONSTANTS_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" namespace chrome { diff --git a/chrome/common/chrome_paths_android.cc b/chrome/common/chrome_paths_android.cc index a69b250..1cee68a 100644 --- a/chrome/common/chrome_paths_android.cc +++ b/chrome/common/chrome_paths_android.cc @@ -4,7 +4,7 @@ #include "chrome/common/chrome_paths_internal.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/chrome/common/chrome_paths_unittest.cc b/chrome/common/chrome_paths_unittest.cc index 9f7441f..5d97afc 100644 --- a/chrome/common/chrome_paths_unittest.cc +++ b/chrome/common/chrome_paths_unittest.cc @@ -6,8 +6,8 @@ #include <stdlib.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/common/chrome_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/chrome_paths_win.cc b/chrome/common/chrome_paths_win.cc index b3e7eff..2bab2da 100644 --- a/chrome/common/chrome_paths_win.cc +++ b/chrome/common/chrome_paths_win.cc @@ -10,7 +10,7 @@ #include <shlobj.h> #include <shobjidl.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/win/metro.h" #include "base/win/scoped_co_mem.h" diff --git a/chrome/common/chrome_utility_messages.h b/chrome/common/chrome_utility_messages.h index e2976c2..f5c6636 100644 --- a/chrome/common/chrome_utility_messages.h +++ b/chrome/common/chrome_utility_messages.h @@ -8,8 +8,8 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/platform_file.h" #include "base/values.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/common/chrome_version_info_win.cc b/chrome/common/chrome_version_info_win.cc index a8ff8c8..01b8e47 100644 --- a/chrome/common/chrome_version_info_win.cc +++ b/chrome/common/chrome_version_info_win.cc @@ -5,11 +5,11 @@ #include "chrome/common/chrome_version_info.h" #include "base/base_paths.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_util.h" -#include "chrome/installer/util/install_util.h" #include "chrome/installer/util/google_update_settings.h" +#include "chrome/installer/util/install_util.h" namespace chrome { diff --git a/chrome/common/extensions/api/extension_api_unittest.cc b/chrome/common/extensions/api/extension_api_unittest.cc index ee169dc..39d9481 100644 --- a/chrome/common/extensions/api/extension_api_unittest.cc +++ b/chrome/common/extensions/api/extension_api_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 6dadfcd..b8f18f7 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -7,8 +7,8 @@ #include "base/base64.h" #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/memory/singleton.h" diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index fb7f3c8..ebe669c3 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -13,7 +13,7 @@ #include <utility> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/hash_tables.h" #include "base/memory/linked_ptr.h" diff --git a/chrome/common/extensions/extension_builder.h b/chrome/common/extensions/extension_builder.h index 65cb453..1591a05 100644 --- a/chrome/common/extensions/extension_builder.h +++ b/chrome/common/extensions/extension_builder.h @@ -5,7 +5,7 @@ #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_BUILDER_H_ #define CHROME_COMMON_EXTENSIONS_EXTENSION_BUILDER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/extensions/manifest.h" diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc index d0c422f..0a3a36b 100644 --- a/chrome/common/extensions/extension_file_util.cc +++ b/chrome/common/extensions/extension_file_util.cc @@ -7,8 +7,8 @@ #include <map> #include <vector> -#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/json/json_file_value_serializer.h" #include "base/logging.h" diff --git a/chrome/common/extensions/extension_l10n_util_unittest.cc b/chrome/common/extensions/extension_l10n_util_unittest.cc index 3e00552..d11da97 100644 --- a/chrome/common/extensions/extension_l10n_util_unittest.cc +++ b/chrome/common/extensions/extension_l10n_util_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_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/common/extensions/extension_resource.h b/chrome/common/extensions/extension_resource.h index aca0d3d..a8d632c 100644 --- a/chrome/common/extensions/extension_resource.h +++ b/chrome/common/extensions/extension_resource.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" // Represents a resource inside an extension. For example, an image, or a // JavaScript file. This is more complicated than just a simple FilePath diff --git a/chrome/common/extensions/extension_set_unittest.cc b/chrome/common/extensions/extension_set_unittest.cc index cf1e8ad..1703966 100644 --- a/chrome/common/extensions/extension_set_unittest.cc +++ b/chrome/common/extensions/extension_set_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index 83bd39f..2d0d059 100644 --- a/chrome/common/extensions/extension_unittest.cc +++ b/chrome/common/extensions/extension_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/common/extensions/extension.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/format_macros.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" diff --git a/chrome/common/extensions/manifest_handler_unittest.cc b/chrome/common/extensions/manifest_handler_unittest.cc index dec16eb..2cad12e 100644 --- a/chrome/common/extensions/manifest_handler_unittest.cc +++ b/chrome/common/extensions/manifest_handler_unittest.cc @@ -5,7 +5,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/common/extensions/manifest_tests/extension_manifest_test.cc b/chrome/common/extensions/manifest_tests/extension_manifest_test.cc index 800f0a0..b4ce528 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifest_test.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifest_test.cc @@ -4,11 +4,11 @@ #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" -#include "base/file_path.h" #include "base/file_util.h" -#include "base/values.h" +#include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" +#include "base/values.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/manifest_handler.h" diff --git a/chrome/common/extensions/unpacker.h b/chrome/common/extensions/unpacker.h index b63a325..f101aa7 100644 --- a/chrome/common/extensions/unpacker.h +++ b/chrome/common/extensions/unpacker.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/tuple.h" #include "chrome/common/extensions/manifest.h" diff --git a/chrome/common/extensions/user_script.h b/chrome/common/extensions/user_script.h index df12959..49632e5 100644 --- a/chrome/common/extensions/user_script.h +++ b/chrome/common/extensions/user_script.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_piece.h" #include "extensions/common/url_pattern.h" #include "extensions/common/url_pattern_set.h" diff --git a/chrome/common/extensions/user_script_unittest.cc b/chrome/common/extensions/user_script_unittest.cc index 4b97d85..9c10b3c 100644 --- a/chrome/common/extensions/user_script_unittest.cc +++ b/chrome/common/extensions/user_script_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/pickle.h" #include "chrome/common/extensions/user_script.h" #include "googleurl/src/gurl.h" diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc index 9fb6ac1..896cc7b 100644 --- a/chrome/common/logging_chrome.cc +++ b/chrome/common/logging_chrome.cc @@ -34,8 +34,8 @@ #include "base/compiler_specific.h" #include "base/debug/debugger.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/path_service.h" #include "base/string_util.h" diff --git a/chrome/common/mac/app_mode_chrome_locator.mm b/chrome/common/mac/app_mode_chrome_locator.mm index 292099d..458d279 100644 --- a/chrome/common/mac/app_mode_chrome_locator.mm +++ b/chrome/common/mac/app_mode_chrome_locator.mm @@ -7,7 +7,7 @@ #import <AppKit/AppKit.h> #include <CoreFoundation/CoreFoundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/foundation_util.h" #include "base/sys_string_conversions.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/common/mac/app_mode_chrome_locator_unittest.mm b/chrome/common/mac/app_mode_chrome_locator_unittest.mm index 69ea8a8..c924111 100644 --- a/chrome/common/mac/app_mode_chrome_locator_unittest.mm +++ b/chrome/common/mac/app_mode_chrome_locator_unittest.mm @@ -6,8 +6,8 @@ #include <CoreFoundation/CoreFoundation.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 "chrome/common/chrome_constants.h" diff --git a/chrome/common/mac/app_mode_common.h b/chrome/common/mac/app_mode_common.h index 2aef955..e4ccb04 100644 --- a/chrome/common/mac/app_mode_common.h +++ b/chrome/common/mac/app_mode_common.h @@ -7,7 +7,7 @@ #import <Foundation/Foundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" // This file contains constants, interfaces, etc. which are common to the diff --git a/chrome/common/mac/mock_launchd.cc b/chrome/common/mac/mock_launchd.cc index c6c196d..3330c86 100644 --- a/chrome/common/mac/mock_launchd.cc +++ b/chrome/common/mac/mock_launchd.cc @@ -9,8 +9,8 @@ #include <sys/un.h> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/message_loop.h" diff --git a/chrome/common/mac/mock_launchd.h b/chrome/common/mac/mock_launchd.h index 0b52622..b88b23a5 100644 --- a/chrome/common/mac/mock_launchd.h +++ b/chrome/common/mac/mock_launchd.h @@ -9,7 +9,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/scoped_cftyperef.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/mac/launchd.h" diff --git a/chrome/common/net/x509_certificate_model_unittest.cc b/chrome/common/net/x509_certificate_model_unittest.cc index 5b40b659..4a08f4c 100644 --- a/chrome/common/net/x509_certificate_model_unittest.cc +++ b/chrome/common/net/x509_certificate_model_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/common/net/x509_certificate_model.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "net/base/cert_test_util.h" #include "net/base/nss_cert_database.h" diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 8bcdc7c..3c84692 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process.h" #include "base/shared_memory.h" #include "base/string16.h" diff --git a/chrome/common/safe_browsing/download_protection_util.cc b/chrome/common/safe_browsing/download_protection_util.cc index 3d4b560..88d5cab 100644 --- a/chrome/common/safe_browsing/download_protection_util.cc +++ b/chrome/common/safe_browsing/download_protection_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" namespace safe_browsing { namespace download_protection_util { diff --git a/chrome/common/service_process_util_mac.mm b/chrome/common/service_process_util_mac.mm index 9ab7b08..025f33c 100644 --- a/chrome/common/service_process_util_mac.mm +++ b/chrome/common/service_process_util_mac.mm @@ -11,8 +11,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" @@ -20,8 +20,8 @@ #include "base/memory/scoped_nsobject.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/sys_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/version.h" diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc index 8fbccbb..8322c5d 100644 --- a/chrome/common/service_process_util_unittest.cc +++ b/chrome/common/service_process_util_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process_util.h" #if !defined(OS_MACOSX) @@ -239,8 +239,8 @@ MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestShutdown) { #include <CoreFoundation/CoreFoundation.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/mac/mac_util.h" #include "base/test/test_timeouts.h" diff --git a/chrome/common/spellcheck_common.cc b/chrome/common/spellcheck_common.cc index 07ddc49a..0f0282e 100644 --- a/chrome/common/spellcheck_common.cc +++ b/chrome/common/spellcheck_common.cc @@ -4,7 +4,7 @@ #include "chrome/common/spellcheck_common.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace chrome { namespace spellcheck_common { diff --git a/chrome/common/switch_utils_unittest.cc b/chrome/common/switch_utils_unittest.cc index b522d91..a228ed5 100644 --- a/chrome/common/switch_utils_unittest.cc +++ b/chrome/common/switch_utils_unittest.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "testing/gtest/include/gtest/gtest.h" TEST(SwitchUtilsTest, RemoveSwitches) { diff --git a/chrome/common/web_apps_unittest.cc b/chrome/common/web_apps_unittest.cc index dbf04ab9..01f39f3 100644 --- a/chrome/common/web_apps_unittest.cc +++ b/chrome/common/web_apps_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/common/web_apps.h" -#include "base/file_path.h" #include "base/file_util.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/common/zip.h b/chrome/common/zip.h index 26c5fec..da8175f 100644 --- a/chrome/common/zip.h +++ b/chrome/common/zip.h @@ -6,7 +6,7 @@ #define CHROME_COMMON_ZIP_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace zip { diff --git a/chrome/common/zip_reader.h b/chrome/common/zip_reader.h index 49396d0..ff4d443 100644 --- a/chrome/common/zip_reader.h +++ b/chrome/common/zip_reader.h @@ -8,8 +8,8 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "base/time.h" diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc index 29e2072..51acd3e 100644 --- a/chrome/installer/gcapi/gcapi.cc +++ b/chrome/installer/gcapi/gcapi.cc @@ -24,8 +24,8 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/process_util.h" #include "base/string16.h" #include "base/string_util.h" diff --git a/chrome/installer/launcher_support/chrome_launcher_support.cc b/chrome/installer/launcher_support/chrome_launcher_support.cc index 8731d71..8f0bee5 100644 --- a/chrome/installer/launcher_support/chrome_launcher_support.cc +++ b/chrome/installer/launcher_support/chrome_launcher_support.cc @@ -8,8 +8,8 @@ #include <tchar.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/string16.h" #include "base/win/registry.h" diff --git a/chrome/installer/mini_installer/decompress_test.cc b/chrome/installer/mini_installer/decompress_test.cc index d531cf9..1592bb4 100644 --- a/chrome/installer/mini_installer/decompress_test.cc +++ b/chrome/installer/mini_installer/decompress_test.cc @@ -4,7 +4,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "chrome/installer/mini_installer/decompress.h" diff --git a/chrome/installer/setup/chrome_frame_ready_mode.cc b/chrome/installer/setup/chrome_frame_ready_mode.cc index fb6ed36..c8a98c4 100644 --- a/chrome/installer/setup/chrome_frame_ready_mode.cc +++ b/chrome/installer/setup/chrome_frame_ready_mode.cc @@ -5,7 +5,7 @@ #include "chrome/installer/setup/chrome_frame_ready_mode.h" #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/string_util.h" diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index b0e447e..53dbbed 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -12,8 +12,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/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/installer/setup/install_unittest.cc b/chrome/installer/setup/install_unittest.cc index 9c7f331..7dfbf0c 100644 --- a/chrome/installer/setup/install_unittest.cc +++ b/chrome/installer/setup/install_unittest.cc @@ -6,8 +6,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/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 414b8b3..5450e32 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_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.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 1f4cbd5..9f112c0 100644 --- a/chrome/installer/setup/setup_util.cc +++ b/chrome/installer/setup/setup_util.cc @@ -9,8 +9,8 @@ #include <windows.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/process_util.h" #include "base/string_util.h" diff --git a/chrome/installer/test/alternate_version_generator.cc b/chrome/installer/test/alternate_version_generator.cc index 5bec8b1..9e54561 100644 --- a/chrome/installer/test/alternate_version_generator.cc +++ b/chrome/installer/test/alternate_version_generator.cc @@ -33,8 +33,8 @@ #include "base/basictypes.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/path_service.h" #include "base/platform_file.h" diff --git a/chrome/installer/test/alternate_version_generator_main.cc b/chrome/installer/test/alternate_version_generator_main.cc index b49e3d2..2227e74 100644 --- a/chrome/installer/test/alternate_version_generator_main.cc +++ b/chrome/installer/test/alternate_version_generator_main.cc @@ -11,8 +11,8 @@ #include "base/at_exit.h" #include "base/basictypes.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/path_service.h" #include "chrome/installer/test/alternate_version_generator.h" diff --git a/chrome/installer/test/resource_loader.cc b/chrome/installer/test/resource_loader.cc index 463c35b..fc4ce55 100644 --- a/chrome/installer/test/resource_loader.cc +++ b/chrome/installer/test/resource_loader.cc @@ -6,7 +6,7 @@ #include <windows.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" namespace { diff --git a/chrome/installer/test/resource_updater.cc b/chrome/installer/test/resource_updater.cc index 2deb301..c308add 100644 --- a/chrome/installer/test/resource_updater.cc +++ b/chrome/installer/test/resource_updater.cc @@ -6,8 +6,8 @@ #include <windows.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" namespace upgrade_test { diff --git a/chrome/installer/test/upgrade_test.cc b/chrome/installer/test/upgrade_test.cc index 87e9eef..ee02414 100644 --- a/chrome/installer/test/upgrade_test.cc +++ b/chrome/installer/test/upgrade_test.cc @@ -5,8 +5,8 @@ // Boilerplate for an upgrade scenario test. The mini_installer.exe residing in // the same directory as the host executable is re-versioned. -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "chrome/installer/test/alternate_version_generator.h" #include "testing/gtest/include/gtest/gtest.h" 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" diff --git a/chrome/nacl/nacl_main_platform_delegate_mac.mm b/chrome/nacl/nacl_main_platform_delegate_mac.mm index 9d86db4..e304ea7 100644 --- a/chrome/nacl/nacl_main_platform_delegate_mac.mm +++ b/chrome/nacl/nacl_main_platform_delegate_mac.mm @@ -6,7 +6,7 @@ #import <Cocoa/Cocoa.h> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/native_library.h" #include "chrome/common/chrome_sandbox_type_mac.h" diff --git a/chrome/nacl/nacl_main_platform_delegate_win.cc b/chrome/nacl/nacl_main_platform_delegate_win.cc index 24bd555..abd9b3e 100644 --- a/chrome/nacl/nacl_main_platform_delegate_win.cc +++ b/chrome/nacl/nacl_main_platform_delegate_win.cc @@ -5,7 +5,7 @@ #include "chrome/nacl/nacl_main_platform_delegate.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/native_library.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/plugin/chrome_content_plugin_client.cc b/chrome/plugin/chrome_content_plugin_client.cc index 2060503..32e4ea7 100644 --- a/chrome/plugin/chrome_content_plugin_client.cc +++ b/chrome/plugin/chrome_content_plugin_client.cc @@ -5,8 +5,8 @@ #include "chrome/plugin/chrome_content_plugin_client.h" #if defined(ENABLE_REMOTING) +#include "base/files/file_path.h" #include "base/path_service.h" -#include "base/file_path.h" #include "content/public/common/content_paths.h" #include "media/base/media.h" #if defined(OS_WIN) diff --git a/chrome/renderer/chrome_render_process_observer.h b/chrome/renderer/chrome_render_process_observer.h index 49356c9..5b82156 100644 --- a/chrome/renderer/chrome_render_process_observer.h +++ b/chrome/renderer/chrome_render_process_observer.h @@ -8,7 +8,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/content_settings.h" #include "content/public/renderer/render_process_observer.h" diff --git a/chrome/renderer/extensions/media_galleries_custom_bindings.cc b/chrome/renderer/extensions/media_galleries_custom_bindings.cc index 73119b29..4a6ede5 100644 --- a/chrome/renderer/extensions/media_galleries_custom_bindings.cc +++ b/chrome/renderer/extensions/media_galleries_custom_bindings.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "chrome/common/extensions/extension_constants.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" diff --git a/chrome/renderer/safe_browsing/scorer_unittest.cc b/chrome/renderer/safe_browsing/scorer_unittest.cc index c9c18c2..a9a9218 100644 --- a/chrome/renderer/safe_browsing/scorer_unittest.cc +++ b/chrome/renderer/safe_browsing/scorer_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/renderer/safe_browsing/scorer.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/format_macros.h" #include "base/hash_tables.h" diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc index d343de9..df0d5dc 100644 --- a/chrome/service/cloud_print/print_system_cups.cc +++ b/chrome/service/cloud_print/print_system_cups.cc @@ -14,7 +14,7 @@ #include <map> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/md5.h" diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc index 3d1fdfe..903d192 100644 --- a/chrome/service/cloud_print/print_system_win.cc +++ b/chrome/service/cloud_print/print_system_win.cc @@ -9,8 +9,8 @@ #include <xpsprint.h> #include "base/bind.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "base/win/object_watcher.h" diff --git a/chrome/service/cloud_print/printer_job_handler.h b/chrome/service/cloud_print/printer_job_handler.h index 510136d..f2ab6ef 100644 --- a/chrome/service/cloud_print/printer_job_handler.h +++ b/chrome/service/cloud_print/printer_job_handler.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" diff --git a/chrome/service/cloud_print/printer_job_handler_unittest.cc b/chrome/service/cloud_print/printer_job_handler_unittest.cc index 05595ab..62aed09 100644 --- a/chrome/service/cloud_print/printer_job_handler_unittest.cc +++ b/chrome/service/cloud_print/printer_job_handler_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/md5.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/service/service_utility_process_host.cc b/chrome/service/service_utility_process_host.cc index 4895ca5..18e1663 100644 --- a/chrome/service/service_utility_process_host.cc +++ b/chrome/service/service_utility_process_host.cc @@ -24,7 +24,7 @@ #include "ui/gfx/rect.h" #if defined(OS_WIN) -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/win/scoped_handle.h" #include "printing/emf_win.h" diff --git a/chrome/service/service_utility_process_host.h b/chrome/service/service_utility_process_host.h index d34247b..9be55d7 100644 --- a/chrome/service/service_utility_process_host.h +++ b/chrome/service/service_utility_process_host.h @@ -11,7 +11,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/process.h" diff --git a/chrome/test/automation/automation_json_requests.cc b/chrome/test/automation/automation_json_requests.cc index 56a3afd..fdfe3bb 100644 --- a/chrome/test/automation/automation_json_requests.cc +++ b/chrome/test/automation/automation_json_requests.cc @@ -5,7 +5,7 @@ #include "chrome/test/automation/automation_json_requests.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/format_macros.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" diff --git a/chrome/test/automation/automation_json_requests.h b/chrome/test/automation/automation_json_requests.h index 120a542..df24832 100644 --- a/chrome/test/automation/automation_json_requests.h +++ b/chrome/test/automation/automation_json_requests.h @@ -9,7 +9,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/strings/string_number_conversions.h" #include "chrome/common/automation_constants.h" #include "chrome/common/automation_id.h" diff --git a/chrome/test/base/chrome_test_suite.h b/chrome/test/base/chrome_test_suite.h index ac786ae..9186f28 100644 --- a/chrome/test/base/chrome_test_suite.h +++ b/chrome/test/base/chrome_test_suite.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "content/public/test/content_test_suite_base.h" diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index cbda548..e56a1e7 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -7,8 +7,8 @@ #include "base/auto_reset.h" #include "base/bind.h" #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/path_service.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/test/base/interactive_test_utils_win.cc b/chrome/test/base/interactive_test_utils_win.cc index 970fd1d..4b68f23 100644 --- a/chrome/test/base/interactive_test_utils_win.cc +++ b/chrome/test/base/interactive_test_utils_win.cc @@ -4,8 +4,8 @@ #include "chrome/test/base/interactive_test_utils.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/stringprintf.h" diff --git a/chrome/test/base/test_launcher_utils.h b/chrome/test/base/test_launcher_utils.h index a026746..242be69 100644 --- a/chrome/test/base/test_launcher_utils.h +++ b/chrome/test/base/test_launcher_utils.h @@ -8,7 +8,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" class CommandLine; diff --git a/chrome/test/base/testing_profile_manager.cc b/chrome/test/base/testing_profile_manager.cc index 7228cac..481d9ba 100644 --- a/chrome/test/base/testing_profile_manager.cc +++ b/chrome/test/base/testing_profile_manager.cc @@ -4,7 +4,7 @@ #include "chrome/test/base/testing_profile_manager.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index e0a1a88..884de82 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -12,8 +12,8 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/chrome/test/base/v8_unit_test.h b/chrome/test/base/v8_unit_test.h index 9279aab..f5cb59e 100644 --- a/chrome/test/base/v8_unit_test.h +++ b/chrome/test/base/v8_unit_test.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_piece.h" #include "testing/gtest/include/gtest/gtest.h" #include "v8/include/v8.h" diff --git a/chrome/test/base/web_ui_browsertest.h b/chrome/test/base/web_ui_browsertest.h index 1744725..8386c51 100644 --- a/chrome/test/base/web_ui_browsertest.h +++ b/chrome/test/base/web_ui_browsertest.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_vector.h" #include "base/string16.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/test/chromedriver/chrome_android_impl.cc b/chrome/test/chromedriver/chrome_android_impl.cc index 53d4ddf..def60c7 100644 --- a/chrome/test/chromedriver/chrome_android_impl.cc +++ b/chrome/test/chromedriver/chrome_android_impl.cc @@ -5,7 +5,7 @@ #include "chrome/test/chromedriver/chrome_android_impl.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process_util.h" #include "base/string_number_conversions.h" #include "chrome/test/chromedriver/net/sync_websocket_impl.h" diff --git a/chrome/test/chromedriver/chrome_desktop_impl.cc b/chrome/test/chromedriver/chrome_desktop_impl.cc index ea8ee27..a6233c4 100644 --- a/chrome/test/chromedriver/chrome_desktop_impl.cc +++ b/chrome/test/chromedriver/chrome_desktop_impl.cc @@ -5,7 +5,7 @@ #include "chrome/test/chromedriver/chrome_desktop_impl.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process.h" #include "base/process_util.h" #include "base/string_number_conversions.h" diff --git a/chrome/test/chromedriver/chrome_finder.cc b/chrome/test/chromedriver/chrome_finder.cc index 0d5c8d7..4a6e420 100644 --- a/chrome/test/chromedriver/chrome_finder.cc +++ b/chrome/test/chromedriver/chrome_finder.cc @@ -11,8 +11,8 @@ #include "base/bind.h" #include "base/callback.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" diff --git a/chrome/test/chromedriver/chrome_finder_mac.mm b/chrome/test/chromedriver/chrome_finder_mac.mm index 5a07d65..f2fe490 100644 --- a/chrome/test/chromedriver/chrome_finder_mac.mm +++ b/chrome/test/chromedriver/chrome_finder_mac.mm @@ -4,7 +4,7 @@ #import <Foundation/Foundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/foundation_util.h" void GetApplicationDirs(std::vector<base::FilePath>* app_dirs) { diff --git a/chrome/test/chromedriver/chrome_finder_unittest.cc b/chrome/test/chromedriver/chrome_finder_unittest.cc index d912f91..7815c7e 100644 --- a/chrome/test/chromedriver/chrome_finder_unittest.cc +++ b/chrome/test/chromedriver/chrome_finder_unittest.cc @@ -6,7 +6,7 @@ #include <vector> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/test/chromedriver/chrome_finder.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/test/chromedriver/chrome_launcher_impl.cc b/chrome/test/chromedriver/chrome_launcher_impl.cc index da65a07..e811582 100644 --- a/chrome/test/chromedriver/chrome_launcher_impl.cc +++ b/chrome/test/chromedriver/chrome_launcher_impl.cc @@ -7,7 +7,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process.h" #include "base/process_util.h" #include "base/stringprintf.h" diff --git a/chrome/test/chromedriver/commands_unittest.cc b/chrome/test/chromedriver/commands_unittest.cc index 08b3393..8baa18a 100644 --- a/chrome/test/chromedriver/commands_unittest.cc +++ b/chrome/test/chromedriver/commands_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/values.h" diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index 9660761..0fae72c 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/chrome/test/logging/win/file_logger.cc b/chrome/test/logging/win/file_logger.cc index 56889a1..9702058 100644 --- a/chrome/test/logging/win/file_logger.cc +++ b/chrome/test/logging/win/file_logger.cc @@ -11,8 +11,8 @@ #include <ios> #include "base/debug/trace_event_win.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/file_path.h" #include "base/logging_win.h" #include "base/string16.h" #include "base/utf_string_conversions.h" diff --git a/chrome/test/logging/win/log_file_reader.cc b/chrome/test/logging/win/log_file_reader.cc index 6259e1c..9fa8985 100644 --- a/chrome/test/logging/win/log_file_reader.cc +++ b/chrome/test/logging/win/log_file_reader.cc @@ -5,7 +5,7 @@ #include "chrome/test/logging/win/log_file_reader.h" #include "base/debug/trace_event_win.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/logging_win.h" #include "base/synchronization/lock.h" diff --git a/chrome/test/logging/win/test_log_collector.cc b/chrome/test/logging/win/test_log_collector.cc index 6350406..0bb1f24 100644 --- a/chrome/test/logging/win/test_log_collector.cc +++ b/chrome/test/logging/win/test_log_collector.cc @@ -11,8 +11,8 @@ #include "base/command_line.h" #include "base/compiler_specific.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/lazy_instance.h" #include "base/logging.h" diff --git a/chrome/test/mini_installer_test/installer_path_provider.h b/chrome/test/mini_installer_test/installer_path_provider.h index 6a2f411..98e1b77 100644 --- a/chrome/test/mini_installer_test/installer_path_provider.h +++ b/chrome/test/mini_installer_test/installer_path_provider.h @@ -6,7 +6,7 @@ #define CHROME_TEST_MINI_INSTALLER_TEST_INSTALLER_PATH_PROVIDER_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace installer_test { diff --git a/chrome/test/mini_installer_test/installer_test_util.h b/chrome/test/mini_installer_test/installer_test_util.h index 1be3e56..bda2617 100644 --- a/chrome/test/mini_installer_test/installer_test_util.h +++ b/chrome/test/mini_installer_test/installer_test_util.h @@ -8,7 +8,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/installer/util/installation_validator.h" #include "chrome/test/mini_installer_test/switch_builder.h" diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc index eda0b0e..5d5fb4e 100644 --- a/chrome/test/mini_installer_test/test.cc +++ b/chrome/test/mini_installer_test/test.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/process_util.h" #include "base/string_util.h" @@ -13,8 +13,8 @@ #include "chrome/installer/util/installation_validator.h" #include "chrome/installer/util/util_constants.h" #include "chrome/test/mini_installer_test/installer_path_provider.h" -#include "chrome/test/mini_installer_test/mini_installer_test_constants.h" #include "chrome/test/mini_installer_test/installer_test_util.h" +#include "chrome/test/mini_installer_test/mini_installer_test_constants.h" #include "chrome/test/mini_installer_test/switch_builder.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/test/nacl/nacl_browsertest_util.h b/chrome/test/nacl/nacl_browsertest_util.h index 972e86b..104b466 100644 --- a/chrome/test/nacl/nacl_browsertest_util.h +++ b/chrome/test/nacl/nacl_browsertest_util.h @@ -5,7 +5,7 @@ #ifndef CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/javascript_test_observer.h" diff --git a/chrome/test/perf/dom_checker_uitest.cc b/chrome/test/perf/dom_checker_uitest.cc index aca6b4b..f4db35a 100644 --- a/chrome/test/perf/dom_checker_uitest.cc +++ b/chrome/test/perf/dom_checker_uitest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_string_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/test/perf/indexeddb_uitest.cc b/chrome/test/perf/indexeddb_uitest.cc index 66ed7e4..787f2bf1 100644 --- a/chrome/test/perf/indexeddb_uitest.cc +++ b/chrome/test/perf/indexeddb_uitest.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/test/test_timeouts.h" #include "base/utf_string_conversions.h" -#include "chrome/common/chrome_paths.h" #include "chrome/common/automation_constants.h" +#include "chrome/common/chrome_paths.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/perf/perf_test.h" #include "chrome/test/ui/javascript_test_util.h" diff --git a/chrome/test/perf/memory_test.cc b/chrome/test/perf/memory_test.cc index 822d443..65fd0da5 100644 --- a/chrome/test/perf/memory_test.cc +++ b/chrome/test/perf/memory_test.cc @@ -4,8 +4,8 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/string_util.h" diff --git a/chrome/test/perf/page_cycler_test.cc b/chrome/test/perf/page_cycler_test.cc index f72e247..1c07a89 100644 --- a/chrome/test/perf/page_cycler_test.cc +++ b/chrome/test/perf/page_cycler_test.cc @@ -4,8 +4,8 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/string_piece.h" diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc index b9e3086..e7c25aa 100644 --- a/chrome/test/perf/rendering/throughput_tests.cc +++ b/chrome/test/perf/rendering/throughput_tests.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/test/perf/tab_switching_test.cc b/chrome/test/perf/tab_switching_test.cc index c850567..45a0891 100644 --- a/chrome/test/perf/tab_switching_test.cc +++ b/chrome/test/perf/tab_switching_test.cc @@ -4,8 +4,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/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/stringprintf.h" diff --git a/chrome/test/perf/url_fetch_test.cc b/chrome/test/perf/url_fetch_test.cc index f4a05725..4a88f29 100644 --- a/chrome/test/perf/url_fetch_test.cc +++ b/chrome/test/perf/url_fetch_test.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/chrome/test/reliability/automated_ui_tests.cc b/chrome/test/reliability/automated_ui_tests.cc index 2fcd1c7..2c371c4 100644 --- a/chrome/test/reliability/automated_ui_tests.cc +++ b/chrome/test/reliability/automated_ui_tests.cc @@ -8,9 +8,9 @@ #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/i18n/time_formatting.h" #include "base/logging.h" #include "base/path_service.h" diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index 303ef3d..18d78e3 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -39,9 +39,9 @@ #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/i18n/time_formatting.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 60c78cd..c5010b0 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -16,8 +16,8 @@ #include "base/bind.h" #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/files/scoped_temp_dir.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" diff --git a/chrome/test/webdriver/commands/chrome_commands.cc b/chrome/test/webdriver/commands/chrome_commands.cc index 1b470aa..f470f29 100644 --- a/chrome/test/webdriver/commands/chrome_commands.cc +++ b/chrome/test/webdriver/commands/chrome_commands.cc @@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "chrome/test/automation/value_conversion_util.h" #include "chrome/test/webdriver/commands/response.h" diff --git a/chrome/test/webdriver/commands/create_session.cc b/chrome/test/webdriver/commands/create_session.cc index 06a95c3..ef53ee7 100644 --- a/chrome/test/webdriver/commands/create_session.cc +++ b/chrome/test/webdriver/commands/create_session.cc @@ -7,7 +7,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/values.h" #include "chrome/test/webdriver/commands/response.h" diff --git a/chrome/test/webdriver/webdriver_automation.cc b/chrome/test/webdriver/webdriver_automation.cc index 67c0ced..f604d78 100644 --- a/chrome/test/webdriver/webdriver_automation.cc +++ b/chrome/test/webdriver/webdriver_automation.cc @@ -12,8 +12,8 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" diff --git a/chrome/test/webdriver/webdriver_automation.h b/chrome/test/webdriver/webdriver_automation.h index 5ca1d16..4c3c646 100644 --- a/chrome/test/webdriver/webdriver_automation.h +++ b/chrome/test/webdriver/webdriver_automation.h @@ -10,7 +10,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/automation_constants.h" diff --git a/chrome/test/webdriver/webdriver_capabilities_parser.h b/chrome/test/webdriver/webdriver_capabilities_parser.h index 583a759..518d3ee 100644 --- a/chrome/test/webdriver/webdriver_capabilities_parser.h +++ b/chrome/test/webdriver/webdriver_capabilities_parser.h @@ -10,7 +10,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/test/webdriver/webdriver_logging.h" diff --git a/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc b/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc index 884bddb..5ae36b3 100644 --- a/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc +++ b/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/base64.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/values.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/test/webdriver/webdriver_logging.cc b/chrome/test/webdriver/webdriver_logging.cc index 467205c..5a597bf 100644 --- a/chrome/test/webdriver/webdriver_logging.cc +++ b/chrome/test/webdriver/webdriver_logging.cc @@ -6,8 +6,8 @@ #include <cmath> -#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 "base/stringprintf.h" diff --git a/chrome/test/webdriver/webdriver_logging.h b/chrome/test/webdriver/webdriver_logging.h index ad39ab7..f257e87 100644 --- a/chrome/test/webdriver/webdriver_logging.h +++ b/chrome/test/webdriver/webdriver_logging.h @@ -9,8 +9,8 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/synchronization/lock.h" #include "base/values.h" diff --git a/chrome/test/webdriver/webdriver_server.cc b/chrome/test/webdriver/webdriver_server.cc index c25f7fe..cc4339f 100644 --- a/chrome/test/webdriver/webdriver_server.cc +++ b/chrome/test/webdriver/webdriver_server.cc @@ -15,8 +15,8 @@ #include "base/at_exit.h" #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/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/string_split.h" diff --git a/chrome/test/webdriver/webdriver_session.cc b/chrome/test/webdriver/webdriver_session.cc index 164d506..9d50dde 100644 --- a/chrome/test/webdriver/webdriver_session.cc +++ b/chrome/test/webdriver/webdriver_session.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/test/webdriver/webdriver_session.h b/chrome/test/webdriver/webdriver_session.h index 9f02c4a..9791cec 100644 --- a/chrome/test/webdriver/webdriver_session.h +++ b/chrome/test/webdriver/webdriver_session.h @@ -10,7 +10,7 @@ #include <vector> #include "base/callback_forward.h" -#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 "base/string16.h" diff --git a/chrome/test/webdriver/webdriver_session_manager.h b/chrome/test/webdriver/webdriver_session_manager.h index 60666dd..bedf0a6 100644 --- a/chrome/test/webdriver/webdriver_session_manager.h +++ b/chrome/test/webdriver/webdriver_session_manager.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/synchronization/lock.h" diff --git a/chrome/test/webdriver/webdriver_util_mac.mm b/chrome/test/webdriver/webdriver_util_mac.mm index a4050fe..e898996 100644 --- a/chrome/test/webdriver/webdriver_util_mac.mm +++ b/chrome/test/webdriver/webdriver_util_mac.mm @@ -6,7 +6,7 @@ #import <Foundation/Foundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/foundation_util.h" namespace webdriver { diff --git a/chrome/test/webdriver/webdriver_util_unittest.cc b/chrome/test/webdriver/webdriver_util_unittest.cc index ee1f15f..a888b01 100644 --- a/chrome/test/webdriver/webdriver_util_unittest.cc +++ b/chrome/test/webdriver/webdriver_util_unittest.cc @@ -6,8 +6,8 @@ #include <string> #include "base/base64.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 "chrome/test/webdriver/webdriver_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/tools/convert_dict/convert_dict.cc b/chrome/tools/convert_dict/convert_dict.cc index 94bfad8..a53784a 100644 --- a/chrome/tools/convert_dict/convert_dict.cc +++ b/chrome/tools/convert_dict/convert_dict.cc @@ -14,16 +14,16 @@ #include <stdio.h> #include "base/at_exit.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/icu_util.h" #include "base/logging.h" #include "base/process_util.h" #include "base/string_util.h" -#include "third_party/hunspell/google/bdict_reader.h" -#include "third_party/hunspell/google/bdict_writer.h" #include "chrome/tools/convert_dict/aff_reader.h" #include "chrome/tools/convert_dict/dic_reader.h" +#include "third_party/hunspell/google/bdict_reader.h" +#include "third_party/hunspell/google/bdict_writer.h" namespace { diff --git a/chrome/tools/crash_service/crash_service.h b/chrome/tools/crash_service/crash_service.h index 0c6dedf..1c9921b 100644 --- a/chrome/tools/crash_service/crash_service.h +++ b/chrome/tools/crash_service/crash_service.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/synchronization/lock.h" namespace google_breakpad { diff --git a/chrome/tools/mac_helpers/infoplist_strings_util.mm b/chrome/tools/mac_helpers/infoplist_strings_util.mm index abfcfde..b663bc8 100644 --- a/chrome/tools/mac_helpers/infoplist_strings_util.mm +++ b/chrome/tools/mac_helpers/infoplist_strings_util.mm @@ -11,8 +11,8 @@ #include <stdio.h> #include <unistd.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/memory/scoped_ptr.h" #include "base/string_piece.h" diff --git a/chrome/tools/perf/flush_cache/flush_cache.cc b/chrome/tools/perf/flush_cache/flush_cache.cc index 8436db0..9229952 100644 --- a/chrome/tools/perf/flush_cache/flush_cache.cc +++ b/chrome/tools/perf/flush_cache/flush_cache.cc @@ -5,9 +5,9 @@ // This little program attempts to flush the system cache for some files. // It's useful for testing Chrome with a cold database. -#include "base/file_path.h" -#include "base/string_piece.h" +#include "base/files/file_path.h" #include "base/process_util.h" +#include "base/string_piece.h" #include "base/sys_string_conversions.h" #include "base/test/test_file_util.h" diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc index 71eb21e..fbd761e 100644 --- a/chrome/tools/profiles/generate_profile.cc +++ b/chrome/tools/profiles/generate_profile.cc @@ -9,8 +9,8 @@ #include "base/at_exit.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/i18n/icu_util.h" #include "base/logging.h" #include "base/message_loop.h" diff --git a/chrome/tools/safe_browsing/sb_sigutil.cc b/chrome/tools/safe_browsing/sb_sigutil.cc index 07da752..4a6d9db 100644 --- a/chrome/tools/safe_browsing/sb_sigutil.cc +++ b/chrome/tools/safe_browsing/sb_sigutil.cc @@ -11,8 +11,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/logging.h" #include "base/memory/ref_counted.h" #include "chrome/browser/safe_browsing/signature_util.h" |