diff options
38 files changed, 4 insertions, 42 deletions
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index 82bf59c..28c40a4 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -11,7 +11,6 @@ #include "base/files/file.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/platform_file.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" #include "base/values.h" diff --git a/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc index b7081e3..43f074b 100644 --- a/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc @@ -8,7 +8,6 @@ #include "base/bind_helpers.h" #include "base/file_util.h" #include "base/message_loop/message_loop.h" -#include "base/platform_file.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h" diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc index 28aa248..fe5d0ee 100644 --- a/chrome/browser/browsing_data/browsing_data_remover.cc +++ b/chrome/browser/browsing_data/browsing_data_remover.cc @@ -11,7 +11,6 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/logging.h" -#include "base/platform_file.h" #include "base/prefs/pref_service.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc index 1432a89..6b290cf 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc @@ -13,7 +13,6 @@ #include "base/files/file_path.h" #include "base/guid.h" #include "base/message_loop/message_loop.h" -#include "base/platform_file.h" #include "base/prefs/testing_pref_service.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" diff --git a/chrome/browser/chromeos/drive/file_system.cc b/chrome/browser/chromeos/drive/file_system.cc index 6e00db4..30b1935 100644 --- a/chrome/browser/chromeos/drive/file_system.cc +++ b/chrome/browser/chromeos/drive/file_system.cc @@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/file_util.h" -#include "base/platform_file.h" #include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/drive/change_list_loader.h" #include "chrome/browser/chromeos/drive/directory_loader.h" diff --git a/chrome/browser/chromeos/drive/resource_entry_conversion.cc b/chrome/browser/chromeos/drive/resource_entry_conversion.cc index 1e13e6c..1974c70 100644 --- a/chrome/browser/chromeos/drive/resource_entry_conversion.cc +++ b/chrome/browser/chromeos/drive/resource_entry_conversion.cc @@ -8,7 +8,6 @@ #include <string> #include "base/logging.h" -#include "base/platform_file.h" #include "base/time/time.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_system_util.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h index 6209105..8f3f0bc 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h @@ -9,7 +9,6 @@ #include <string> -#include "base/platform_file.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/extensions/file_manager/private_api_base.h" diff --git a/chrome/browser/component_updater/cld_component_installer.cc b/chrome/browser/component_updater/cld_component_installer.cc index 190925a..d43e00c 100644 --- a/chrome/browser/component_updater/cld_component_installer.cc +++ b/chrome/browser/component_updater/cld_component_installer.cc @@ -13,7 +13,6 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/platform_file.h" #include "chrome/browser/component_updater/default_component_installer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/devtools/devtools_file_system_indexer.cc b/chrome/browser/devtools/devtools_file_system_indexer.cc index 7e0d6fc..edeeca1 100644 --- a/chrome/browser/devtools/devtools_file_system_indexer.cc +++ b/chrome/browser/devtools/devtools_file_system_indexer.cc @@ -13,7 +13,6 @@ #include "base/files/file_util_proxy.h" #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/platform_file.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_thread.h" @@ -24,8 +23,6 @@ using base::FilePath; using base::Time; using base::TimeDelta; using base::TimeTicks; -using base::PassPlatformFile; -using base::PlatformFile; using content::BrowserThread; using std::map; using std::set; diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc index 024efde..ffb2cc3 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc @@ -14,7 +14,6 @@ #include "apps/app_window_registry.h" #include "base/callback.h" #include "base/lazy_instance.h" -#include "base/platform_file.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h index afc06dd..e16fdce 100644 --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h @@ -7,7 +7,6 @@ #include <map> -#include "base/platform_file.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/sync_file_system/conflict_resolution_policy.h" #include "chrome/browser/sync_file_system/sync_file_status.h" diff --git a/chrome/browser/extensions/updater/extension_downloader.cc b/chrome/browser/extensions/updater/extension_downloader.cc index 7cad3ea..612d0d0 100644 --- a/chrome/browser/extensions/updater/extension_downloader.cc +++ b/chrome/browser/extensions/updater/extension_downloader.cc @@ -14,7 +14,6 @@ #include "base/memory/scoped_handle.h" #include "base/metrics/histogram.h" #include "base/metrics/sparse_histogram.h" -#include "base/platform_file.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/chrome/browser/first_run/upgrade_util_linux.cc b/chrome/browser/first_run/upgrade_util_linux.cc index 4fbe33b..cc01451 100644 --- a/chrome/browser/first_run/upgrade_util_linux.cc +++ b/chrome/browser/first_run/upgrade_util_linux.cc @@ -10,7 +10,6 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/platform_file.h" #include "base/process/launch.h" #include "chrome/browser/first_run/upgrade_util_linux.h" diff --git a/chrome/browser/media/webrtc_log_util.h b/chrome/browser/media/webrtc_log_util.h index 1a0fb55..1bc1f95 100644 --- a/chrome/browser/media/webrtc_log_util.h +++ b/chrome/browser/media/webrtc_log_util.h @@ -5,7 +5,8 @@ #ifndef CHROME_BROWSER_MEDIA_WEBRTC_LOG_UTIL_H_ #define CHROME_BROWSER_MEDIA_WEBRTC_LOG_UTIL_H_ -#include "base/platform_file.h" +#include "base/files/file_path.h" +#include "base/time/time.h" class WebRtcLogUtil { public: diff --git a/chrome/browser/media_galleries/fileapi/iapps_data_provider.cc b/chrome/browser/media_galleries/fileapi/iapps_data_provider.cc index a6e91a6..472a9ce 100644 --- a/chrome/browser/media_galleries/fileapi/iapps_data_provider.cc +++ b/chrome/browser/media_galleries/fileapi/iapps_data_provider.cc @@ -11,7 +11,6 @@ #include "base/format_macros.h" #include "base/location.h" #include "base/logging.h" -#include "base/platform_file.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/chrome/browser/media_galleries/fileapi/iphoto_data_provider.cc b/chrome/browser/media_galleries/fileapi/iphoto_data_provider.cc index bdb1fa4..5b7603a1e 100644 --- a/chrome/browser/media_galleries/fileapi/iphoto_data_provider.cc +++ b/chrome/browser/media_galleries/fileapi/iphoto_data_provider.cc @@ -10,7 +10,6 @@ #include "base/callback.h" #include "base/location.h" #include "base/logging.h" -#include "base/platform_file.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/media_galleries/fileapi/itunes_data_provider.cc b/chrome/browser/media_galleries/fileapi/itunes_data_provider.cc index c714a67..c485df9 100644 --- a/chrome/browser/media_galleries/fileapi/itunes_data_provider.cc +++ b/chrome/browser/media_galleries/fileapi/itunes_data_provider.cc @@ -13,7 +13,6 @@ #include "base/i18n/icu_string_conversions.h" #include "base/location.h" #include "base/logging.h" -#include "base/platform_file.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc b/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc index 929ce85..866f1ef 100644 --- a/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc +++ b/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc @@ -10,7 +10,6 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop/message_loop_proxy.h" -#include "base/platform_file.h" #include "base/sequenced_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc b/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc index aa1559b..480dd64 100644 --- a/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc +++ b/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc @@ -5,7 +5,6 @@ #include "chrome/browser/media_galleries/fileapi/media_file_validator_factory.h" #include "base/files/file_path.h" -#include "base/platform_file.h" #include "chrome/browser/media_galleries/fileapi/supported_audio_video_checker.h" #include "chrome/browser/media_galleries/fileapi/supported_image_type_validator.h" #include "webkit/browser/fileapi/copy_or_move_file_validator.h" diff --git a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc index 990f774..ef3803b 100644 --- a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc +++ b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "base/numerics/safe_conversions.h" -#include "base/platform_file.h" #include "chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h" #include "chrome/browser/media_galleries/fileapi/mtp_device_map_service.h" #include "chrome/browser/media_galleries/fileapi/native_media_file_util.h" diff --git a/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc index 2046075..04bf334 100644 --- a/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc @@ -14,7 +14,6 @@ #include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop_proxy.h" -#include "base/platform_file.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" diff --git a/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h b/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h index 890982a..0a698e6 100644 --- a/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h +++ b/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h @@ -11,7 +11,6 @@ #include "base/location.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/platform_file.h" #include "chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h" #include "webkit/browser/fileapi/async_file_util.h" @@ -119,7 +118,7 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate { // directory file entries. // // If |root| is not a directory, |error_callback| is invoked to notify the - // caller about the platform file error and process the next pending request. + // caller about the file error and process the next pending request. void OnDidGetFileInfoToReadDirectory( const std::string& root, const ReadDirectorySuccessCallback& success_callback, @@ -156,7 +155,7 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate { // Called when WriteDataIntoSnapshotFile() fails. // - // |error| specifies the platform file error code. + // |error| specifies the file error code. // // |current_snapshot_request_info_.error_callback| is invoked to notify the // caller about |error|. diff --git a/chrome/browser/media_galleries/linux/mtp_device_task_helper.h b/chrome/browser/media_galleries/linux/mtp_device_task_helper.h index c1f5539..02bc9f5 100644 --- a/chrome/browser/media_galleries/linux/mtp_device_task_helper.h +++ b/chrome/browser/media_galleries/linux/mtp_device_task_helper.h @@ -11,7 +11,6 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/platform_file.h" #include "chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h" #include "device/media_transfer_protocol/mtp_file_entry.pb.h" #include "webkit/browser/fileapi/async_file_util.h" diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index dbd8065..5611838 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -7,7 +7,6 @@ #include "base/bind_helpers.h" #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" -#include "base/platform_file.h" #include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/stl_util.h" diff --git a/chrome/browser/safe_browsing/sandboxed_zip_analyzer.cc b/chrome/browser/safe_browsing/sandboxed_zip_analyzer.cc index 7e11419..72578a8 100644 --- a/chrome/browser/safe_browsing/sandboxed_zip_analyzer.cc +++ b/chrome/browser/safe_browsing/sandboxed_zip_analyzer.cc @@ -8,7 +8,6 @@ #include "base/command_line.h" #include "base/location.h" #include "base/logging.h" -#include "base/platform_file.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/common/chrome_utility_messages.h" #include "chrome/common/safe_browsing/zip_analyzer.h" diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index fcd601a..7cca291 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -16,7 +16,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/metrics/histogram.h" -#include "base/platform_file.h" #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc index 0e79ee0..23b2682 100644 --- a/chrome/browser/spellchecker/spellcheck_service.cc +++ b/chrome/browser/spellchecker/spellcheck_service.cc @@ -4,7 +4,6 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" -#include "base/platform_file.h" #include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" #include "base/strings/string_split.h" diff --git a/chrome/browser/sync_file_system/local/local_file_sync_context.cc b/chrome/browser/sync_file_system/local/local_file_sync_context.cc index eb12b87..bf75b1f 100644 --- a/chrome/browser/sync_file_system/local/local_file_sync_context.cc +++ b/chrome/browser/sync_file_system/local/local_file_sync_context.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/file_util.h" #include "base/location.h" -#include "base/platform_file.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" #include "base/task_runner_util.h" diff --git a/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc b/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc index a532037..b8d1bef 100644 --- a/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc +++ b/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc @@ -11,7 +11,6 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/message_loop/message_loop.h" -#include "base/platform_file.h" #include "base/stl_util.h" #include "chrome/browser/sync_file_system/local/canned_syncable_file_system.h" #include "chrome/browser/sync_file_system/local/local_file_change_tracker.h" diff --git a/chrome/browser/ui/webui/help/help_handler.h b/chrome/browser/ui/webui/help/help_handler.h index 67562b9..812f40b 100644 --- a/chrome/browser/ui/webui/help/help_handler.h +++ b/chrome/browser/ui/webui/help/help_handler.h @@ -15,7 +15,6 @@ #include "content/public/browser/web_ui_message_handler.h" #if defined(OS_CHROMEOS) -#include "base/platform_file.h" #include "chrome/browser/chromeos/version_loader.h" #endif // defined(OS_CHROMEOS) diff --git a/chrome/installer/setup/install_unittest.cc b/chrome/installer/setup/install_unittest.cc index 10fe418..ed2fd97 100644 --- a/chrome/installer/setup/install_unittest.cc +++ b/chrome/installer/setup/install_unittest.cc @@ -11,7 +11,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/platform_file.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_path_override.h" diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc index 0dcd987..aaa5663 100644 --- a/chrome/installer/util/install_util.cc +++ b/chrome/installer/util/install_util.cc @@ -18,7 +18,6 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/platform_file.h" #include "base/process/launch.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/renderer/pepper/pepper_shared_memory_message_filter.h b/chrome/renderer/pepper/pepper_shared_memory_message_filter.h index 9186f24..9fb21fb 100644 --- a/chrome/renderer/pepper/pepper_shared_memory_message_filter.h +++ b/chrome/renderer/pepper/pepper_shared_memory_message_filter.h @@ -7,7 +7,6 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/platform_file.h" #include "ppapi/c/pp_instance.h" #include "ppapi/host/instance_message_filter.h" diff --git a/chrome/renderer/spellchecker/spellcheck_unittest.cc b/chrome/renderer/spellchecker/spellcheck_unittest.cc index 7369f56..68ff023 100644 --- a/chrome/renderer/spellchecker/spellcheck_unittest.cc +++ b/chrome/renderer/spellchecker/spellcheck_unittest.cc @@ -5,7 +5,6 @@ #include "base/file_util.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" -#include "base/platform_file.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/utility/media_galleries/iphoto_library_parser.h b/chrome/utility/media_galleries/iphoto_library_parser.h index 914e664..dcfe5bd 100644 --- a/chrome/utility/media_galleries/iphoto_library_parser.h +++ b/chrome/utility/media_galleries/iphoto_library_parser.h @@ -7,7 +7,6 @@ #include <string> -#include "base/platform_file.h" #include "chrome/common/media_galleries/iphoto_library.h" namespace iphoto { diff --git a/chrome/utility/media_galleries/itunes_library_parser.h b/chrome/utility/media_galleries/itunes_library_parser.h index e01599c..380e60b 100644 --- a/chrome/utility/media_galleries/itunes_library_parser.h +++ b/chrome/utility/media_galleries/itunes_library_parser.h @@ -7,7 +7,6 @@ #include <string> -#include "base/platform_file.h" #include "chrome/common/media_galleries/itunes_library.h" namespace itunes { diff --git a/components/policy/core/common/config_dir_policy_loader.cc b/components/policy/core/common/config_dir_policy_loader.cc index aa5b09e..3c39891 100644 --- a/components/policy/core/common/config_dir_policy_loader.cc +++ b/components/policy/core/common/config_dir_policy_loader.cc @@ -15,7 +15,6 @@ #include "base/json/json_file_value_serializer.h" #include "base/json/json_reader.h" #include "base/logging.h" -#include "base/platform_file.h" #include "base/stl_util.h" #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_load_status.h" diff --git a/components/policy/core/common/policy_loader_mac.cc b/components/policy/core/common/policy_loader_mac.cc index 91bda09..1860c66 100644 --- a/components/policy/core/common/policy_loader_mac.cc +++ b/components/policy/core/common/policy_loader_mac.cc @@ -11,7 +11,6 @@ #include "base/mac/foundation_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/path_service.h" -#include "base/platform_file.h" #include "base/sequenced_task_runner.h" #include "base/strings/sys_string_conversions.h" #include "base/values.h" |