diff options
Diffstat (limited to 'content/browser')
75 files changed, 84 insertions, 84 deletions
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" |