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 /content | |
| 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 'content')
135 files changed, 160 insertions, 160 deletions
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index f9607c1..213f65e 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -5,22 +5,22 @@ #include "content/public/app/android_library_loader_hooks.h" #include "base/android/base_jni_registrar.h" -#include "base/android/jni_registrar.h" #include "base/android/jni_android.h" +#include "base/android/jni_registrar.h" #include "base/android/jni_string.h" #include "base/at_exit.h" #include "base/base_switches.h" #include "base/command_line.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/string_util.h" #include "base/tracked_objects.h" #include "content/app/android/app_jni_registrar.h" #include "content/browser/android/browser_jni_registrar.h" -#include "content/common/android/common_jni_registrar.h" #include "content/common/android/command_line.h" +#include "content/common/android/common_jni_registrar.h" #include "content/public/common/content_switches.h" #include "content/public/common/result_codes.h" #include "jni/LibraryLoader_jni.h" diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index cfe320a..147b5a0 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -11,7 +11,7 @@ #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/debug/trace_event.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/i18n/icu_util.h" #include "base/lazy_instance.h" #include "base/logging.h" @@ -20,9 +20,9 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/profiler/alternate_timer.h" +#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/string_number_conversions.h" #include "content/browser/browser_main.h" #include "content/common/set_process_title.h" #include "content/common/url_schemes.h" @@ -39,8 +39,8 @@ #include "ipc/ipc_switches.h" #include "media/base/media.h" #include "sandbox/win/src/sandbox_types.h" -#include "ui/base/ui_base_switches.h" #include "ui/base/ui_base_paths.h" +#include "ui/base/ui_base_switches.h" #include "ui/base/win/dpi.h" #include "webkit/user_agent/user_agent.h" @@ -59,10 +59,10 @@ #endif #if defined(OS_WIN) -#include <cstring> #include <atlbase.h> #include <atlapp.h> #include <malloc.h> +#include <cstring> #elif defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" #if !defined(OS_IOS) diff --git a/content/browser/accessibility/browser_accessibility_state_impl_win.cc b/content/browser/accessibility/browser_accessibility_state_impl_win.cc index 77a6332..3290355 100644 --- a/content/browser/accessibility/browser_accessibility_state_impl_win.cc +++ b/content/browser/accessibility/browser_accessibility_state_impl_win.cc @@ -4,10 +4,10 @@ #include "content/browser/accessibility/browser_accessibility_state_impl.h" -#include <psapi.h> #include <windows.h> +#include <psapi.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/metrics/histogram.h" #include "base/string_util.h" diff --git a/content/browser/accessibility/dump_accessibility_tree_helper.h b/content/browser/accessibility/dump_accessibility_tree_helper.h index 9428237..ff5883b 100644 --- a/content/browser/accessibility/dump_accessibility_tree_helper.h +++ b/content/browser/accessibility/dump_accessibility_tree_helper.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "base/utf_string_conversions.h" #include "content/browser/accessibility/browser_accessibility.h" diff --git a/content/browser/accessibility/dump_accessibility_tree_helper_mac.mm b/content/browser/accessibility/dump_accessibility_tree_helper_mac.mm index 895c7e7..669956b 100644 --- a/content/browser/accessibility/dump_accessibility_tree_helper_mac.mm +++ b/content/browser/accessibility/dump_accessibility_tree_helper_mac.mm @@ -6,7 +6,7 @@ #import <Cocoa/Cocoa.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "content/browser/accessibility/browser_accessibility_cocoa.h" #include "content/browser/accessibility/browser_accessibility_mac.h" diff --git a/content/browser/accessibility/dump_accessibility_tree_helper_win.cc b/content/browser/accessibility/dump_accessibility_tree_helper_win.cc index 229bf35..6dcbcc9 100644 --- a/content/browser/accessibility/dump_accessibility_tree_helper_win.cc +++ b/content/browser/accessibility/dump_accessibility_tree_helper_win.cc @@ -8,7 +8,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" diff --git a/content/browser/appcache/chrome_appcache_service.cc b/content/browser/appcache/chrome_appcache_service.cc index b3bfd0f..97a821d 100644 --- a/content/browser/appcache/chrome_appcache_service.cc +++ b/content/browser/appcache/chrome_appcache_service.cc @@ -4,8 +4,8 @@ #include "content/browser/appcache/chrome_appcache_service.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/resource_context.h" diff --git a/content/browser/browser_child_process_host_impl.cc b/content/browser/browser_child_process_host_impl.cc index cd6167a..f752330 100644 --- a/content/browser/browser_child_process_host_impl.cc +++ b/content/browser/browser_child_process_host_impl.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/lazy_instance.h" #include "base/logging.h" #include "base/metrics/histogram.h" @@ -21,8 +21,8 @@ #include "content/browser/tracing/trace_message_filter.h" #include "content/common/child_process_host_impl.h" #include "content/common/plugin_messages.h" -#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_child_process_host_delegate.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_data.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/notification_service.h" diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index a8e68cf..1630fdd 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc @@ -21,7 +21,7 @@ #include "content/public/common/result_codes.h" #if defined(OS_WIN) -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/common/sandbox_policy.h" #include "content/public/common/sandbox_init.h" #elif defined(OS_MACOSX) diff --git a/content/browser/child_process_security_policy_browsertest.cc b/content/browser/child_process_security_policy_browsertest.cc index 2cd2f51..e475c02 100644 --- a/content/browser/child_process_security_policy_browsertest.cc +++ b/content/browser/child_process_security_policy_browsertest.cc @@ -5,7 +5,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process_util.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/web_contents/web_contents_impl.h" diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc index e705fa6..45694fa 100644 --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc @@ -5,7 +5,7 @@ #include "content/browser/child_process_security_policy_impl.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/platform_file.h" diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc index d9a4446..a2eed34 100644 --- a/content/browser/child_process_security_policy_unittest.cc +++ b/content/browser/child_process_security_policy_unittest.cc @@ -6,7 +6,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/platform_file.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/public/common/url_constants.h" diff --git a/content/browser/device_orientation/device_orientation_browsertest.cc b/content/browser/device_orientation/device_orientation_browsertest.cc index 5bceb69..7edfbc2 100644 --- a/content/browser/device_orientation/device_orientation_browsertest.cc +++ b/content/browser/device_orientation/device_orientation_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/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "content/browser/device_orientation/device_data.h" diff --git a/content/browser/devtools/renderer_overrides_handler.cc b/content/browser/devtools/renderer_overrides_handler.cc index fbe2f5b..96680c1 100644 --- a/content/browser/devtools/renderer_overrides_handler.cc +++ b/content/browser/devtools/renderer_overrides_handler.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/stringprintf.h" #include "base/values.h" #include "content/browser/child_process_security_policy_impl.h" diff --git a/content/browser/dom_storage/dom_storage_context_impl.cc b/content/browser/dom_storage/dom_storage_context_impl.cc index 381d67da..4c00467 100644 --- a/content/browser/dom_storage/dom_storage_context_impl.cc +++ b/content/browser/dom_storage/dom_storage_context_impl.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop_proxy.h" #include "content/browser/dom_storage/session_storage_namespace_impl.h" #include "content/public/browser/browser_thread.h" diff --git a/content/browser/download/base_file.h b/content/browser/download/base_file.h index 9f6d4343..faa73c8 100644 --- a/content/browser/download/base_file.h +++ b/content/browser/download/base_file.h @@ -7,7 +7,7 @@ #include <string> -#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/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc index bfae37f..9e8921c 100644 --- a/content/browser/download/download_browsertest.cc +++ b/content/browser/download/download_browsertest.cc @@ -6,8 +6,8 @@ // in a pure content context. Over time tests should be migrated here. #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 "content/browser/download/byte_stream.h" #include "content/browser/download/download_file_factory.h" diff --git a/content/browser/download/download_create_info.h b/content/browser/download/download_create_info.h index b8e1afa..9f88da1 100644 --- a/content/browser/download/download_create_info.h +++ b/content/browser/download/download_create_info.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/time.h" #include "content/browser/download/download_file.h" #include "content/browser/download/download_request_handle.h" diff --git a/content/browser/download/download_file.h b/content/browser/download/download_file.h index d52f190..e135efc 100644 --- a/content/browser/download/download_file.h +++ b/content/browser/download/download_file.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 "content/common/content_export.h" #include "content/public/browser/download_interrupt_reasons.h" diff --git a/content/browser/download/download_file_factory.h b/content/browser/download/download_file_factory.h index 7ff9468..dc260ca 100644 --- a/content/browser/download/download_file_factory.h +++ b/content/browser/download/download_file_factory.h @@ -5,9 +5,9 @@ #ifndef CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_FILE_FACTORY_H_ #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_FILE_FACTORY_H_ -#include "base/file_path.h" -#include "base/memory/scoped_ptr.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" #include "content/common/content_export.h" #include "googleurl/src/gurl.h" diff --git a/content/browser/download/download_item_impl.h b/content/browser/download/download_item_impl.h index ad3ef6d..42cd190 100644 --- a/content/browser/download/download_item_impl.h +++ b/content/browser/download/download_item_impl.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/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" diff --git a/content/browser/download/download_item_impl_delegate.h b/content/browser/download/download_item_impl_delegate.h index 63b4717..33f8422 100644 --- a/content/browser/download/download_item_impl_delegate.h +++ b/content/browser/download/download_item_impl_delegate.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_DELEGATE_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/common/content_export.h" #include "content/public/browser/download_danger_type.h" #include "content/public/browser/download_item.h" diff --git a/content/browser/download/download_net_log_parameters.cc b/content/browser/download/download_net_log_parameters.cc index a987864..2bbf55f 100644 --- a/content/browser/download/download_net_log_parameters.cc +++ b/content/browser/download/download_net_log_parameters.cc @@ -5,7 +5,7 @@ #include "content/browser/download/download_net_log_parameters.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_number_conversions.h" #include "base/values.h" diff --git a/content/browser/download/drag_download_file.h b/content/browser/download/drag_download_file.h index 32c8afe..e97f585 100644 --- a/content/browser/download/drag_download_file.h +++ b/content/browser/download/drag_download_file.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_FILE_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 "base/run_loop.h" diff --git a/content/browser/download/drag_download_file_browsertest.cc b/content/browser/download/drag_download_file_browsertest.cc index 83daf02..e35cbfb 100644 --- a/content/browser/download/drag_download_file_browsertest.cc +++ b/content/browser/download/drag_download_file_browsertest.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 "content/browser/download/download_file_factory.h" #include "content/browser/download/download_file_impl.h" diff --git a/content/browser/download/drag_download_util.cc b/content/browser/download/drag_download_util.cc index d275702..ea1c897 100644 --- a/content/browser/download/drag_download_util.cc +++ b/content/browser/download/drag_download_util.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/memory/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/string_util.h" diff --git a/content/browser/download/file_metadata_linux.cc b/content/browser/download/file_metadata_linux.cc index 9c9318d..73f66d7 100644 --- a/content/browser/download/file_metadata_linux.cc +++ b/content/browser/download/file_metadata_linux.cc @@ -7,8 +7,8 @@ #include <sys/types.h> #include <sys/xattr.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "googleurl/src/gurl.h" diff --git a/content/browser/download/file_metadata_mac.mm b/content/browser/download/file_metadata_mac.mm index 0a45cdb..548229c 100644 --- a/content/browser/download/file_metadata_mac.mm +++ b/content/browser/download/file_metadata_mac.mm @@ -7,7 +7,7 @@ #include <ApplicationServices/ApplicationServices.h> #include <Foundation/Foundation.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/mac_util.h" diff --git a/content/browser/download/file_metadata_unittest_linux.cc b/content/browser/download/file_metadata_unittest_linux.cc index c1aa415..504f130 100644 --- a/content/browser/download/file_metadata_unittest_linux.cc +++ b/content/browser/download/file_metadata_unittest_linux.cc @@ -10,8 +10,8 @@ #include <sstream> #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/logging.h" #include "base/strings/string_split.h" diff --git a/content/browser/download/mhtml_generation_browsertest.cc b/content/browser/download/mhtml_generation_browsertest.cc index 534a530..6944a6c 100644 --- a/content/browser/download/mhtml_generation_browsertest.cc +++ b/content/browser/download/mhtml_generation_browsertest.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/run_loop.h" #include "content/public/browser/web_contents.h" diff --git a/content/browser/download/mock_download_file.h b/content/browser/download/mock_download_file.h index 39d4804..8a80477 100644 --- a/content/browser/download/mock_download_file.h +++ b/content/browser/download/mock_download_file.h @@ -5,10 +5,10 @@ #ifndef CONTENT_BROWSER_DOWNLOAD_MOCK_DOWNLOAD_FILE_H_ #define CONTENT_BROWSER_DOWNLOAD_MOCK_DOWNLOAD_FILE_H_ -#include <string> #include <map> +#include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "content/browser/download/download_file.h" #include "content/public/browser/download_id.h" diff --git a/content/browser/download/save_file.h b/content/browser/download/save_file.h index 0b2ec06..bafa253 100644 --- a/content/browser/download/save_file.h +++ b/content/browser/download/save_file.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_DOWNLOAD_SAVE_FILE_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "content/browser/download/base_file.h" #include "content/browser/download/save_types.h" diff --git a/content/browser/download/save_item.h b/content/browser/download/save_item.h index 3a1d8df..106126f 100644 --- a/content/browser/download/save_item.h +++ b/content/browser/download/save_item.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_DOWNLOAD_SAVE_ITEM_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/browser/download/save_types.h" #include "content/public/common/referrer.h" #include "googleurl/src/gurl.h" diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc index af3ac78..bff3a1a 100644 --- a/content/browser/download/save_package.cc +++ b/content/browser/download/save_package.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/i18n/file_util_icu.h" #include "base/logging.h" #include "base/message_loop.h" diff --git a/content/browser/download/save_package.h b/content/browser/download/save_package.h index 4d17368..222a011 100644 --- a/content/browser/download/save_package.h +++ b/content/browser/download/save_package.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/ref_counted.h" diff --git a/content/browser/download/save_package_unittest.cc b/content/browser/download/save_package_unittest.cc index da4ccc8..e925aca 100644 --- a/content/browser/download/save_package_unittest.cc +++ b/content/browser/download/save_package_unittest.cc @@ -4,7 +4,7 @@ #include <string> -#include "base/file_path.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/content/browser/download/save_types.h b/content/browser/download/save_types.h index ab3fba9..5f60e1e 100644 --- a/content/browser/download/save_types.h +++ b/content/browser/download/save_types.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "googleurl/src/gurl.h" namespace content { diff --git a/content/browser/fileapi/browser_file_system_helper.cc b/content/browser/fileapi/browser_file_system_helper.cc index 21e7b7d..e7b22c5 100644 --- a/content/browser/fileapi/browser_file_system_helper.cc +++ b/content/browser/fileapi/browser_file_system_helper.cc @@ -4,11 +4,11 @@ #include "content/browser/fileapi/browser_file_system_helper.h" -#include <vector> #include <string> +#include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/threading/sequenced_worker_pool.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" diff --git a/content/browser/fileapi/file_system_browsertest.cc b/content/browser/fileapi/file_system_browsertest.cc index 7a226af..74633a0 100644 --- a/content/browser/fileapi/file_system_browsertest.cc +++ b/content/browser/fileapi/file_system_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 "base/memory/ref_counted.h" #include "base/test/thread_test_helper.h" #include "content/browser/web_contents/web_contents_impl.h" diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc index 1d5c4b7..8db59cb 100644 --- a/content/browser/fileapi/fileapi_message_filter.cc +++ b/content/browser/fileapi/fileapi_message_filter.cc @@ -8,7 +8,7 @@ #include <vector> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "base/threading/thread.h" diff --git a/content/browser/geolocation/win7_location_api_win.cc b/content/browser/geolocation/win7_location_api_win.cc index 093a2aa..26f81b3 100644 --- a/content/browser/geolocation/win7_location_api_win.cc +++ b/content/browser/geolocation/win7_location_api_win.cc @@ -6,7 +6,7 @@ #include "base/base_paths_win.h" #include "base/command_line.h" -#include "base/file_path.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/content/browser/gpu/gpu_blacklist_unittest.cc b/content/browser/gpu/gpu_blacklist_unittest.cc index 08a6cf2..a7e93bf 100644 --- a/content/browser/gpu/gpu_blacklist_unittest.cc +++ b/content/browser/gpu/gpu_blacklist_unittest.cc @@ -5,8 +5,8 @@ #include <vector> #include "base/base_paths.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 "content/browser/gpu/gpu_blacklist.h" diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h index a0853e5..e41f191 100644 --- a/content/browser/gpu/gpu_data_manager_impl.h +++ b/content/browser/gpu/gpu_data_manager_impl.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/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" diff --git a/content/browser/gpu/gpu_pixel_browsertest.cc b/content/browser/gpu/gpu_pixel_browsertest.cc index 391c899..876bdb9 100644 --- a/content/browser/gpu/gpu_pixel_browsertest.cc +++ b/content/browser/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_number_conversions.h" #include "base/string_util.h" diff --git a/content/browser/hyphenator/hyphenator_message_filter.h b/content/browser/hyphenator/hyphenator_message_filter.h index a3216cf..a5ed21c 100644 --- a/content/browser/hyphenator/hyphenator_message_filter.h +++ b/content/browser/hyphenator/hyphenator_message_filter.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_HYPHENATOR_HYPHENATOR_MESSAGE_FILTER_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/platform_file.h" #include "content/common/content_export.h" diff --git a/content/browser/hyphenator/hyphenator_message_filter_unittest.cc b/content/browser/hyphenator/hyphenator_message_filter_unittest.cc index 2516b31..385d56ee 100644 --- a/content/browser/hyphenator/hyphenator_message_filter_unittest.cc +++ b/content/browser/hyphenator/hyphenator_message_filter_unittest.cc @@ -5,7 +5,7 @@ #include "content/browser/hyphenator/hyphenator_message_filter.h" #include "base/base_paths.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string16.h" #include "base/utf_string_conversions.h" diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc index 2dbe347..0c968aa 100644 --- a/content/browser/in_process_webkit/indexed_db_browsertest.cc +++ b/content/browser/in_process_webkit/indexed_db_browsertest.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/memory/ref_counted.h" #include "base/message_loop.h" #include "base/process_util.h" diff --git a/content/browser/in_process_webkit/indexed_db_context_impl.h b/content/browser/in_process_webkit/indexed_db_context_impl.h index e8a2a7c0..284f41f 100644 --- a/content/browser/in_process_webkit/indexed_db_context_impl.h +++ b/content/browser/in_process_webkit/indexed_db_context_impl.h @@ -9,7 +9,7 @@ #include <set> #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 "content/public/browser/indexed_db_context.h" diff --git a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc index fc054fd..197bfc8 100644 --- a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc +++ b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc @@ -5,8 +5,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/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" diff --git a/content/browser/loader/redirect_to_file_resource_handler.h b/content/browser/loader/redirect_to_file_resource_handler.h index 574738a..459b982 100644 --- a/content/browser/loader/redirect_to_file_resource_handler.h +++ b/content/browser/loader/redirect_to_file_resource_handler.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_LOADER_REDIRECT_TO_FILE_RESOURCE_HANDLER_H_ #define CONTENT_BROWSER_LOADER_REDIRECT_TO_FILE_RESOURCE_HANDLER_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/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc index f62b1a2..139b416 100644 --- a/content/browser/loader/resource_dispatcher_host_unittest.cc +++ b/content/browser/loader/resource_dispatcher_host_unittest.cc @@ -5,7 +5,7 @@ #include <vector> #include "base/bind.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/pickle.h" diff --git a/content/browser/mime_registry_message_filter.h b/content/browser/mime_registry_message_filter.h index 5dc8153..4a719a5 100644 --- a/content/browser/mime_registry_message_filter.h +++ b/content/browser/mime_registry_message_filter.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_MIME_REGISTRY_MESSAGE_FILTER_H_ #define CONTENT_BROWSER_MIME_REGISTRY_MESSAGE_FILTER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/public/browser/browser_message_filter.h" namespace content { diff --git a/content/browser/pepper_flash_settings_helper_impl.cc b/content/browser/pepper_flash_settings_helper_impl.cc index bd99b1a..f51248c 100644 --- a/content/browser/pepper_flash_settings_helper_impl.cc +++ b/content/browser/pepper_flash_settings_helper_impl.cc @@ -4,7 +4,7 @@ #include "content/browser/pepper_flash_settings_helper_impl.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/browser/plugin_service_impl.h" #include "content/public/browser/browser_thread.h" #include "ipc/ipc_channel_handle.h" diff --git a/content/browser/plugin_loader_posix_unittest.cc b/content/browser/plugin_loader_posix_unittest.cc index 01b961a..6944384 100644 --- a/content/browser/plugin_loader_posix_unittest.cc +++ b/content/browser/plugin_loader_posix_unittest.cc @@ -6,7 +6,7 @@ #include "base/at_exit.h" #include "base/bind.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/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index d63aca9..62be9db7 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -15,8 +15,8 @@ #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/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc index 7f393af..e3dcdd1 100644 --- a/content/browser/plugin_service_impl.cc +++ b/content/browser/plugin_service_impl.cc @@ -7,7 +7,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/message_loop_proxy.h" #include "base/path_service.h" diff --git a/content/browser/power_save_blocker_linux.cc b/content/browser/power_save_blocker_linux.cc index e6c7791..a0e3764 100644 --- a/content/browser/power_save_blocker_linux.cc +++ b/content/browser/power_save_blocker_linux.cc @@ -16,7 +16,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/environment.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/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc index dfdf3df..a4dd416 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -8,7 +8,7 @@ #include "base/base_switches.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process_util.h" #include "base/utf_string_conversions.h" #include "content/browser/browser_child_process_host_impl.h" diff --git a/content/browser/ppapi_plugin_process_host.h b/content/browser/ppapi_plugin_process_host.h index 01a43c9..4acf9a2 100644 --- a/content/browser/ppapi_plugin_process_host.h +++ b/content/browser/ppapi_plugin_process_host.h @@ -9,7 +9,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/content/browser/renderer_host/file_utilities_message_filter.h b/content/browser/renderer_host/file_utilities_message_filter.h index 9faacef..1b5640a 100644 --- a/content/browser/renderer_host/file_utilities_message_filter.h +++ b/content/browser/renderer_host/file_utilities_message_filter.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_RENDERER_HOST_FILE_UTILITIES_MESSAGE_FILTER_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/public/browser/browser_message_filter.h" #include "ipc/ipc_platform_file.h" diff --git a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h index 9271805..626866b 100644 --- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h +++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.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 "content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h" #include "content/common/content_export.h" #include "content/public/browser/browser_ppapi_host.h" diff --git a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h index 7863680..057adc1 100644 --- a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_FLASH_FILE_MESSAGE_FILTER_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/process.h" #include "ppapi/c/pp_instance.h" diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.cc b/content/browser/renderer_host/pepper/pepper_message_filter.cc index fb40d85..4654898 100644 --- a/content/browser/renderer_host/pepper/pepper_message_filter.cc +++ b/content/browser/renderer_host/pepper/pepper_message_filter.cc @@ -8,8 +8,8 @@ #include "base/bind_helpers.h" #include "base/callback.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/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.h b/content/browser/renderer_host/pepper/pepper_message_filter.h index bc5a5c9..5956c75 100644 --- a/content/browser/renderer_host/pepper/pepper_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_message_filter.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/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/process.h" diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h index 3a1bdd2..6f19c33 100644 --- a/content/browser/renderer_host/render_message_filter.h +++ b/content/browser/renderer_host/render_message_filter.h @@ -13,7 +13,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/linked_ptr.h" #include "base/sequenced_task_runner_helpers.h" #include "base/shared_memory.h" diff --git a/content/browser/safe_util_win.cc b/content/browser/safe_util_win.cc index f0d8dc5..700f4b3 100644 --- a/content/browser/safe_util_win.cc +++ b/content/browser/safe_util_win.cc @@ -7,7 +7,7 @@ #include "content/browser/safe_util_win.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc index b1810f3..b09641c 100644 --- a/content/browser/speech/speech_recognition_browsertest.cc +++ b/content/browser/speech/speech_recognition_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/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/string_number_conversions.h" diff --git a/content/browser/storage_partition_impl.h b/content/browser/storage_partition_impl.h index 6de28ed..90722e2 100644 --- a/content/browser/storage_partition_impl.h +++ b/content/browser/storage_partition_impl.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_STORAGE_PARTITION_IMPL_H_ #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "content/browser/appcache/chrome_appcache_service.h" #include "content/browser/dom_storage/dom_storage_context_impl.h" diff --git a/content/browser/storage_partition_impl_map.cc b/content/browser/storage_partition_impl_map.cc index 75c4898..dedb5a0 100644 --- a/content/browser/storage_partition_impl_map.cc +++ b/content/browser/storage_partition_impl_map.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/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" @@ -22,8 +22,8 @@ #include "content/browser/net/view_http_cache_job_factory.h" #include "content/browser/resource_context_impl.h" #include "content/browser/storage_partition_impl.h" -#include "content/browser/webui/url_data_manager_backend.h" #include "content/browser/tcmalloc_internals_request_job.h" +#include "content/browser/webui/url_data_manager_backend.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" @@ -31,8 +31,8 @@ #include "content/public/common/content_constants.h" #include "content/public/common/url_constants.h" #include "crypto/sha2.h" -#include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_context.h" +#include "net/url_request/url_request_context_getter.h" #include "webkit/appcache/view_appcache_internals_job.h" #include "webkit/blob/blob_data.h" #include "webkit/blob/blob_url_request_job_factory.h" diff --git a/content/browser/system_message_window_win_unittest.cc b/content/browser/system_message_window_win_unittest.cc index 0fa5109..38566b5 100644 --- a/content/browser/system_message_window_win_unittest.cc +++ b/content/browser/system_message_window_win_unittest.cc @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/system_monitor/system_monitor.h" #include "base/test/mock_devices_changed_observer.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/content/browser/web_contents/web_contents_drag_win.cc b/content/browser/web_contents/web_contents_drag_win.cc index 32dcb69..cb83dcd 100644 --- a/content/browser/web_contents/web_contents_drag_win.cc +++ b/content/browser/web_contents/web_contents_drag_win.cc @@ -9,8 +9,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/message_loop.h" #include "base/pickle.h" #include "base/threading/platform_thread.h" diff --git a/content/browser/web_contents/web_drag_dest_gtk.cc b/content/browser/web_contents/web_drag_dest_gtk.cc index 1d8e960..dcd89b0 100644 --- a/content/browser/web_contents/web_drag_dest_gtk.cc +++ b/content/browser/web_contents/web_drag_dest_gtk.cc @@ -7,7 +7,7 @@ #include <string> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "content/browser/renderer_host/render_view_host_impl.h" diff --git a/content/browser/web_contents/web_drag_source_gtk.h b/content/browser/web_contents/web_drag_source_gtk.h index 1926ca2..d95b40e 100644 --- a/content/browser/web_contents/web_drag_source_gtk.h +++ b/content/browser/web_contents/web_drag_source_gtk.h @@ -8,7 +8,7 @@ #include <gtk/gtk.h> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/string16.h" #include "content/common/content_export.h" diff --git a/content/browser/web_contents/web_drag_source_mac.h b/content/browser/web_contents/web_drag_source_mac.h index a6cabec..a8f1f00 100644 --- a/content/browser/web_contents/web_drag_source_mac.h +++ b/content/browser/web_contents/web_drag_source_mac.h @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/scoped_cftyperef.h" #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" diff --git a/content/browser/web_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm index f371dcb..83521f1 100644 --- a/content/browser/web_contents/web_drag_source_mac.mm +++ b/content/browser/web_contents/web_drag_source_mac.mm @@ -7,7 +7,7 @@ #include <sys/param.h> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/mac_util.h" #include "base/pickle.h" #include "base/string_util.h" diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc index 73c4447..0c335b6 100644 --- a/content/browser/worker_host/test/worker_browsertest.cc +++ b/content/browser/worker_host/test/worker_browsertest.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/sys_info.h" #include "base/test/test_timeouts.h" #include "base/utf_string_conversions.h" diff --git a/content/browser/worker_host/worker_process_host.h b/content/browser/worker_host/worker_process_host.h index 6802189..147348d 100644 --- a/content/browser/worker_host/worker_process_host.h +++ b/content/browser/worker_host/worker_process_host.h @@ -10,11 +10,11 @@ #include <utility> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" -#include "content/common/content_export.h" #include "content/browser/worker_host/worker_document_set.h" #include "content/browser/worker_host/worker_storage_partition.h" +#include "content/common/content_export.h" #include "content/public/browser/browser_child_process_host_delegate.h" #include "content/public/browser/browser_child_process_host_iterator.h" #include "googleurl/src/gurl.h" diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc index 77d037c..606811d 100644 --- a/content/common/child_process_host_impl.cc +++ b/content/common/child_process_host_impl.cc @@ -8,7 +8,7 @@ #include "base/atomicops.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" diff --git a/content/common/gpu/media/mac_video_decode_accelerator.mm b/content/common/gpu/media/mac_video_decode_accelerator.mm index ed8f2e6..cfc3077 100644 --- a/content/common/gpu/media/mac_video_decode_accelerator.mm +++ b/content/common/gpu/media/mac_video_decode_accelerator.mm @@ -5,14 +5,14 @@ #include "content/common/gpu/media/mac_video_decode_accelerator.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" +#include "base/location.h" #import "base/mac/foundation_util.h" #import "base/memory/ref_counted_memory.h" #import "base/message_loop.h" -#include "base/location.h" #include "base/native_library.h" -#include "ui/surface/io_surface_support_mac.h" #include "ui/gfx/video_decode_acceleration_support_mac.h" +#include "ui/surface/io_surface_support_mac.h" namespace content { diff --git a/content/common/mac/font_loader.mm b/content/common/mac/font_loader.mm index b309ab9..faf965f 100644 --- a/content/common/mac/font_loader.mm +++ b/content/common/mac/font_loader.mm @@ -7,8 +7,8 @@ #import <Cocoa/Cocoa.h> #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/mac/foundation_util.h" #include "base/mac/mac_util.h" diff --git a/content/common/mime_registry_messages.h b/content/common/mime_registry_messages.h index 6d94189..e698369 100644 --- a/content/common/mime_registry_messages.h +++ b/content/common/mime_registry_messages.h @@ -4,7 +4,7 @@ // Multiply-included message file, so no include guard. -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/public/common/common_param_traits.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_param_traits.h" diff --git a/content/common/resource_dispatcher.cc b/content/common/resource_dispatcher.cc index ce49f4e..9c2535d 100644 --- a/content/common/resource_dispatcher.cc +++ b/content/common/resource_dispatcher.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" #include "base/debug/alias.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/shared_memory.h" diff --git a/content/common/sandbox_init_mac.cc b/content/common/sandbox_init_mac.cc index 766497d..8c6fb3d 100644 --- a/content/common/sandbox_init_mac.cc +++ b/content/common/sandbox_init_mac.cc @@ -5,7 +5,7 @@ #include "content/public/common/sandbox_init.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "content/common/sandbox_mac.h" #include "content/public/common/content_switches.h" diff --git a/content/common/sandbox_mac_diraccess_unittest.mm b/content/common/sandbox_mac_diraccess_unittest.mm index 87061a8..f3c8e97 100644 --- a/content/common/sandbox_mac_diraccess_unittest.mm +++ b/content/common/sandbox_mac_diraccess_unittest.mm @@ -10,9 +10,9 @@ extern "C" { } #include "base/file_util.h" -#include "base/file_path.h" -#include "base/test/multiprocess_test.h" +#include "base/files/file_path.h" #include "base/sys_string_conversions.h" +#include "base/test/multiprocess_test.h" #include "base/utf_string_conversions.h" #include "content/common/sandbox_mac.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/common/sandbox_mac_unittest_helper.mm b/content/common/sandbox_mac_unittest_helper.mm index 8635b32..6417e68 100644 --- a/content/common/sandbox_mac_unittest_helper.mm +++ b/content/common/sandbox_mac_unittest_helper.mm @@ -10,7 +10,7 @@ extern "C" { #include <map> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "content/common/sandbox_mac.h" diff --git a/content/common/set_process_title.cc b/content/common/set_process_title.cc index 9641cc6..30b3b70 100644 --- a/content/common/set_process_title.cc +++ b/content/common/set_process_title.cc @@ -19,8 +19,8 @@ #if defined(OS_LINUX) #include <sys/prctl.h> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/process_util.h" #include "base/string_util.h" // Linux/glibc doesn't natively have setproctitle(). diff --git a/content/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc index 12594a3..da9169b8 100644 --- a/content/gpu/gpu_info_collector_win.cc +++ b/content/gpu/gpu_info_collector_win.cc @@ -15,15 +15,15 @@ #include "base/command_line.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/message_loop.h" #include "base/metrics/histogram.h" #include "base/scoped_native_library.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/threading/thread.h" #include "base/threading/worker_pool.h" #include "base/win/scoped_com_initializer.h" diff --git a/content/plugin/plugin_thread.h b/content/plugin/plugin_thread.h index a8750aa..f967126 100644 --- a/content/plugin/plugin_thread.h +++ b/content/plugin/plugin_thread.h @@ -5,7 +5,7 @@ #ifndef CONTENT_PLUGIN_PLUGIN_THREAD_H_ #define CONTENT_PLUGIN_PLUGIN_THREAD_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/native_library.h" #include "build/build_config.h" #include "content/common/child_thread.h" diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc index 887f581..1b07240 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -4,7 +4,7 @@ #include "content/public/browser/content_browser_client.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "googleurl/src/gurl.h" #include "ui/gfx/image/image_skia.h" diff --git a/content/public/browser/devtools_http_handler_delegate.h b/content/public/browser/devtools_http_handler_delegate.h index 2e3d2e2..6bf0c36 100644 --- a/content/public/browser/devtools_http_handler_delegate.h +++ b/content/public/browser/devtools_http_handler_delegate.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" class GURL; diff --git a/content/public/browser/download_item.h b/content/public/browser/download_item.h index e3e8d32..423f82b 100644 --- a/content/public/browser/download_item.h +++ b/content/public/browser/download_item.h @@ -21,7 +21,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "base/supports_user_data.h" #include "content/public/browser/download_danger_type.h" diff --git a/content/public/browser/download_manager.h b/content/public/browser/download_manager.h index d834ab1..330aa57 100644 --- a/content/public/browser/download_manager.h +++ b/content/public/browser/download_manager.h @@ -32,7 +32,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/sequenced_task_runner_helpers.h" #include "base/time.h" diff --git a/content/public/browser/download_manager_delegate.h b/content/public/browser/download_manager_delegate.h index 8b41161..cce381f 100644 --- a/content/public/browser/download_manager_delegate.h +++ b/content/public/browser/download_manager_delegate.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/logging.h" #include "base/time.h" #include "content/common/content_export.h" diff --git a/content/public/browser/download_save_info.h b/content/public/browser/download_save_info.h index 24ad355..6b7a14a 100644 --- a/content/public/browser/download_save_info.h +++ b/content/public/browser/download_save_info.h @@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_DOWNLOAD_SAVE_INFO_H_ #define CONTENT_PUBLIC_BROWSER_DOWNLOAD_SAVE_INFO_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/linked_ptr.h" #include "content/common/content_export.h" #include "net/base/file_stream.h" diff --git a/content/public/browser/storage_partition.h b/content/public/browser/storage_partition.h index a0427fb..a931405 100644 --- a/content/public/browser/storage_partition.h +++ b/content/public/browser/storage_partition.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" class GURL; diff --git a/content/public/common/content_constants.h b/content/public/common/content_constants.h index 3f5af15..57d9112 100644 --- a/content/public/common/content_constants.h +++ b/content/public/common/content_constants.h @@ -9,7 +9,7 @@ #include <stddef.h> // For size_t -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/common/content_export.h" namespace content { diff --git a/content/public/common/file_chooser_params.h b/content/public/common/file_chooser_params.h index 32261d1..7c31254 100644 --- a/content/public/common/file_chooser_params.h +++ b/content/public/common/file_chooser_params.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "content/common/content_export.h" diff --git a/content/public/common/pepper_plugin_info.h b/content/public/common/pepper_plugin_info.h index 057b0469..87b4aa9 100644 --- a/content/public/common/pepper_plugin_info.h +++ b/content/public/common/pepper_plugin_info.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/common/content_export.h" #include "webkit/plugins/ppapi/plugin_module.h" #include "webkit/plugins/webplugininfo.h" diff --git a/content/public/test/render_widget_test.cc b/content/public/test/render_widget_test.cc index 564768b..260776d 100644 --- a/content/public/test/render_widget_test.cc +++ b/content/public/test/render_widget_test.cc @@ -5,16 +5,16 @@ #include "content/public/test/render_widget_test.h" #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted_memory.h" #include "base/stringprintf.h" #include "content/common/view_messages.h" #include "content/renderer/render_view_impl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/jpeg_codec.h" #include "ui/gfx/size.h" #include "ui/surface/transport_dib.h" diff --git a/content/public/test/render_widget_test.h b/content/public/test/render_widget_test.h index d163ea1..45a5f74 100644 --- a/content/public/test/render_widget_test.h +++ b/content/public/test/render_widget_test.h @@ -6,7 +6,7 @@ #define CONTENT_PUBLIC_TEST_RENDER_WIDGET_TEST_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/public/test/render_view_test.h" class SkBitmap; diff --git a/content/public/test/test_browser_context.cc b/content/public/test/test_browser_context.cc index 7dc1c84..b3aa752 100644 --- a/content/public/test/test_browser_context.cc +++ b/content/public/test/test_browser_context.cc @@ -4,7 +4,7 @@ #include "content/public/test/test_browser_context.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/test/null_task_runner.h" #include "content/public/test/mock_resource_context.h" #include "net/url_request/url_request_context.h" diff --git a/content/public/test/test_browser_context.h b/content/public/test/test_browser_context.h index 120fd01..fbf4275 100644 --- a/content/public/test/test_browser_context.h +++ b/content/public/test/test_browser_context.h @@ -6,7 +6,7 @@ #define CONTENT_PUBLIC_TEST_TEST_BROWSER_CONTEXT_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/gtest_prod_util.h" #include "base/memory/ref_counted.h" diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.cc b/content/renderer/browser_plugin/browser_plugin_browsertest.cc index 5fe4d13..ef49650 100644 --- a/content/renderer/browser_plugin/browser_plugin_browsertest.cc +++ b/content/renderer/browser_plugin/browser_plugin_browsertest.cc @@ -4,8 +4,8 @@ #include "content/renderer/browser_plugin/browser_plugin_browsertest.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 "content/common/browser_plugin_messages.h" diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc index 7fa3823..d0a4adfd 100644 --- a/content/renderer/gpu/gpu_benchmarking_extension.cc +++ b/content/renderer/gpu/gpu_benchmarking_extension.cc @@ -7,8 +7,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/memory/scoped_vector.h" #include "base/string_number_conversions.h" #include "content/common/gpu/gpu_rendering_stats.h" diff --git a/content/renderer/pepper/pepper_directory_reader_host.cc b/content/renderer/pepper/pepper_directory_reader_host.cc index 4aeda9d..2c3846c 100644 --- a/content/renderer/pepper/pepper_directory_reader_host.cc +++ b/content/renderer/pepper/pepper_directory_reader_host.cc @@ -5,7 +5,7 @@ #include "content/renderer/pepper/pepper_directory_reader_host.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "ppapi/c/pp_errors.h" diff --git a/content/renderer/pepper/pepper_file_chooser_host.cc b/content/renderer/pepper/pepper_file_chooser_host.cc index 98edda5..29ff737 100644 --- a/content/renderer/pepper/pepper_file_chooser_host.cc +++ b/content/renderer/pepper/pepper_file_chooser_host.cc @@ -4,7 +4,7 @@ #include "content/renderer/pepper/pepper_file_chooser_host.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/utf_string_conversions.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "content/renderer/render_view_impl.h" diff --git a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc index f49ab533..8517220 100644 --- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc +++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc @@ -2,11 +2,11 @@ // 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 "content/common/view_messages.h" -#include "content/public/test/render_view_test.h" #include "content/public/common/file_chooser_params.h" +#include "content/public/test/render_view_test.h" #include "content/renderer/pepper/mock_renderer_ppapi_host.h" #include "content/renderer/pepper/pepper_file_chooser_host.h" #include "content/renderer/render_view_impl.h" diff --git a/content/renderer/pepper/pepper_hung_plugin_filter.h b/content/renderer/pepper/pepper_hung_plugin_filter.h index 20b8ae5..7cbecf0 100644 --- a/content/renderer/pepper/pepper_hung_plugin_filter.h +++ b/content/renderer/pepper/pepper_hung_plugin_filter.h @@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_HUNG_PLUGIN_FILTER_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_HUNG_PLUGIN_FILTER_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/message_loop_proxy.h" #include "base/synchronization/lock.h" diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc index 8366161..5217709 100644 --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.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/files/file_util_proxy.h" #include "base/logging.h" #include "base/strings/string_split.h" diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.cc b/content/renderer/pepper/renderer_ppapi_host_impl.cc index 2e9bdb8b..50b4fc7 100644 --- a/content/renderer/pepper/renderer_ppapi_host_impl.cc +++ b/content/renderer/pepper/renderer_ppapi_host_impl.cc @@ -4,7 +4,7 @@ #include "content/renderer/pepper/renderer_ppapi_host_impl.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "content/renderer/pepper/pepper_graphics_2d_host.h" #include "content/renderer/pepper/pepper_in_process_resource_creation.h" diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index f9b759f..3649775 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -5,17 +5,17 @@ #include "content/renderer/renderer_webkitplatformsupport_impl.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/metrics/histogram.h" #include "base/platform_file.h" #include "base/shared_memory.h" #include "base/utf_string_conversions.h" #include "content/common/database_util.h" +#include "content/common/file_utilities_messages.h" #include "content/common/fileapi/webblobregistry_impl.h" #include "content/common/fileapi/webfilesystem_impl.h" -#include "content/common/file_utilities_messages.h" #include "content/common/indexed_db/proxy_webidbfactory_impl.h" #include "content/common/mime_registry_messages.h" #include "content/common/npobject_util.h" @@ -63,8 +63,8 @@ #endif #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -#include <string> #include <map> +#include <string> #include "base/synchronization/lock.h" #include "content/common/child_process_sandbox_support_impl_linux.h" diff --git a/content/shell/android/browsertests_apk/content_browser_tests_android.cc b/content/shell/android/browsertests_apk/content_browser_tests_android.cc index 9a2fd46..3eba884 100644 --- a/content/shell/android/browsertests_apk/content_browser_tests_android.cc +++ b/content/shell/android/browsertests_apk/content_browser_tests_android.cc @@ -13,8 +13,8 @@ #include "base/android/scoped_java_ref.h" #include "base/base_switches.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/stringprintf.h" diff --git a/content/shell/paths_mac.h b/content/shell/paths_mac.h index ac1f4f9..b906564 100644 --- a/content/shell/paths_mac.h +++ b/content/shell/paths_mac.h @@ -5,7 +5,7 @@ #ifndef CONTENT_SHELL_PATHS_MAC_H_ #define CONTENT_SHELL_PATHS_MAC_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" // Sets up base::mac::FrameworkBundle. void OverrideFrameworkBundlePath(); diff --git a/content/shell/shell_browser_context.h b/content/shell/shell_browser_context.h index 44e0a16..fa61e66 100644 --- a/content/shell/shell_browser_context.h +++ b/content/shell/shell_browser_context.h @@ -6,7 +6,7 @@ #define CONTENT_SHELL_SHELL_BROWSER_CONTEXT_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 "content/public/browser/browser_context.h" diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc index 182f7a2..4b266d9 100644 --- a/content/shell/shell_browser_main.cc +++ b/content/shell/shell_browser_main.cc @@ -7,8 +7,8 @@ #include <iostream> #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/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc index dd81bce..fee6852 100644 --- a/content/shell/shell_browser_main_parts.cc +++ b/content/shell/shell_browser_main_parts.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/message_loop.h" #include "base/string_number_conversions.h" #include "base/threading/thread.h" @@ -25,8 +25,8 @@ #include "ui/base/resource/resource_bundle.h" #if defined(OS_ANDROID) -#include "net/base/network_change_notifier.h" #include "net/android/network_change_notifier_factory_android.h" +#include "net/base/network_change_notifier.h" #endif #if defined(USE_AURA) && defined(USE_X11) diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h index 40902ff..8c1b199 100644 --- a/content/shell/shell_content_browser_client.h +++ b/content/shell/shell_content_browser_client.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 "content/public/browser/content_browser_client.h" diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc index fdbd098..133494b 100644 --- a/content/shell/shell_main_delegate.cc +++ b/content/shell/shell_main_delegate.cc @@ -5,7 +5,7 @@ #include "content/shell/shell_main_delegate.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 "content/public/browser/browser_main_runner.h" @@ -42,8 +42,8 @@ #endif // OS_MACOSX #if defined(OS_WIN) -#include "base/logging_win.h" #include <initguid.h> +#include "base/logging_win.h" #endif namespace { diff --git a/content/shell/shell_message_filter.h b/content/shell/shell_message_filter.h index 82dd350..f7697e4 100644 --- a/content/shell/shell_message_filter.h +++ b/content/shell/shell_message_filter.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/public/browser/browser_message_filter.h" namespace quota { diff --git a/content/shell/shell_render_process_observer.h b/content/shell/shell_render_process_observer.h index 2d587a5..ec09926 100644 --- a/content/shell/shell_render_process_observer.h +++ b/content/shell/shell_render_process_observer.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/memory/scoped_ptr.h" #include "content/public/renderer/render_process_observer.h" diff --git a/content/shell/shell_url_request_context_getter.h b/content/shell/shell_url_request_context_getter.h index e631a18..23f79d1 100644 --- a/content/shell/shell_url_request_context_getter.h +++ b/content/shell/shell_url_request_context_getter.h @@ -6,7 +6,7 @@ #define CONTENT_SHELL_SHELL_URL_REQUEST_CONTEXT_GETTER_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 "net/url_request/url_request_context_getter.h" diff --git a/content/shell/webkit_test_controller.h b/content/shell/webkit_test_controller.h index 6ca620c..a546e5a 100644 --- a/content/shell/webkit_test_controller.h +++ b/content/shell/webkit_test_controller.h @@ -9,7 +9,7 @@ #include <string> #include "base/cancelable_callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/synchronization/lock.h" #include "base/threading/non_thread_safe.h" #include "content/public/browser/notification_observer.h" diff --git a/content/shell/webkit_test_platform_support_linux.cc b/content/shell/webkit_test_platform_support_linux.cc index 82111da..42d4d68 100644 --- a/content/shell/webkit_test_platform_support_linux.cc +++ b/content/shell/webkit_test_platform_support_linux.cc @@ -9,8 +9,8 @@ #include <fontconfig/fontconfig.h> #include <unistd.h> -#include "base/file_path.h" -#include "base/file_path.h" +#include "base/files/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" namespace content { diff --git a/content/shell/webkit_test_runner.h b/content/shell/webkit_test_runner.h index 07b5d09..39da167 100644 --- a/content/shell/webkit_test_runner.h +++ b/content/shell/webkit_test_runner.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "content/public/renderer/render_view_observer.h" #include "content/public/renderer/render_view_observer_tracker.h" diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc index 74cee29..aa91303 100644 --- a/content/test/content_browser_test.cc +++ b/content/test/content_browser_test.cc @@ -5,7 +5,7 @@ #include "content/test/content_browser_test.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/content/test/content_browser_test_utils.cc b/content/test/content_browser_test_utils.cc index b1c2e51..c67050c 100644 --- a/content/test/content_browser_test_utils.cc +++ b/content/test/content_browser_test_utils.cc @@ -5,7 +5,7 @@ #include "content/test/content_browser_test_utils.h" #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/run_loop.h" #include "content/public/browser/navigation_controller.h" diff --git a/content/test/gpu/gpu_test_expectations_parser.h b/content/test/gpu/gpu_test_expectations_parser.h index c80a280..d1fa23a 100644 --- a/content/test/gpu/gpu_test_expectations_parser.h +++ b/content/test/gpu/gpu_test_expectations_parser.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "content/test/gpu/gpu_test_config.h" class GPUTestExpectationsParser { diff --git a/content/test/layout_browsertest.cc b/content/test/layout_browsertest.cc index 8b15d81..0140aff 100644 --- a/content/test/layout_browsertest.cc +++ b/content/test/layout_browsertest.cc @@ -7,8 +7,8 @@ #include <sstream> #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/rand_util.h" diff --git a/content/test/layout_browsertest.h b/content/test/layout_browsertest.h index 626ef5c..5977cf7 100644 --- a/content/test/layout_browsertest.h +++ b/content/test/layout_browsertest.h @@ -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 "content/test/content_browser_test.h" diff --git a/content/test/layout_test_http_server.h b/content/test/layout_test_http_server.h index 66035b6..80587f7 100644 --- a/content/test/layout_test_http_server.h +++ b/content/test/layout_test_http_server.h @@ -6,7 +6,7 @@ #define CONTENT_TEST_LAYOUT_TEST_HTTP_SERVER_H_ #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #if defined(OS_WIN) #include "base/win/scoped_handle.h" diff --git a/content/test/test_content_browser_client.cc b/content/test/test_content_browser_client.cc index c1c054b..05dcd12 100644 --- a/content/test/test_content_browser_client.cc +++ b/content/test/test_content_browser_client.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "content/test/test_web_contents_view.h" #include "googleurl/src/gurl.h" diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc index 4b0f72a..fa09e9f 100644 --- a/content/test/test_content_client.cc +++ b/content/test/test_content_client.cc @@ -5,7 +5,7 @@ #include "content/test/test_content_client.h" #include "base/base_paths.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_piece.h" diff --git a/content/test/webrtc_audio_device_test.h b/content/test/webrtc_audio_device_test.h index 3f10bb6..71327b6 100644 --- a/content/test/webrtc_audio_device_test.h +++ b/content/test/webrtc_audio_device_test.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/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc index 69b743a..4febffa 100644 --- a/content/utility/utility_thread_impl.cc +++ b/content/utility/utility_thread_impl.cc @@ -7,7 +7,7 @@ #include <stddef.h> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_vector.h" #include "content/common/child_process.h" #include "content/common/child_process_messages.h" diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc index 5396e44..1035d63 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/hash_tables.h" #include "base/linux_util.h" #include "base/memory/scoped_ptr.h" |