From db5935f15f750739a5937e60e26b2ede16ba803d Mon Sep 17 00:00:00 2001 From: dcheng Date: Fri, 25 Mar 2016 17:16:27 -0700 Subject: Move base::FreeDeleter into its own header. Final blocker to wholly deleting base/memory/scoped_ptr.h. BUG=554298 Review URL: https://codereview.chromium.org/1837483003 Cr-Commit-Position: refs/heads/master@{#383417} --- base/BUILD.gn | 1 + base/base.gypi | 1 + base/debug/stack_trace_posix.cc | 2 ++ base/file_version_info_win.h | 1 + base/memory/free_deleter.h | 25 ++++++++++++++++++++++ base/memory/scoped_ptr.h | 15 ------------- base/memory/shared_memory_win_unittest.cc | 1 + base/process/process_info_mac.cc | 1 + base/security_unittest.cc | 1 + .../braille_display_private/brlapi_connection.cc | 1 + chrome/common/chrome_paths_mac.mm | 1 + chrome/service/cloud_print/cdd_conversion_win.cc | 1 + chrome/service/cloud_print/cdd_conversion_win.h | 4 +++- chrome/service/cloud_print/print_system_win.cc | 1 + chromecast/base/bind_to_task_runner_unittest.cc | 1 + components/exo/wayland/server.cc | 1 + .../storage_monitor_win_unittest.cc | 1 + .../browser/geolocation/wifi_data_provider_win.cc | 1 + courgette/assembly_program.h | 1 + device/hid/hid_service_win.cc | 1 + extensions/browser/api/cast_channel/cast_framer.cc | 1 + ipc/attachment_broker_mac_unittest.cc | 1 + media/audio/alsa/alsa_output.cc | 1 + media/audio/alsa/audio_manager_alsa.cc | 1 + media/audio/mac/audio_manager_mac.cc | 1 + media/base/bind_to_current_loop_unittest.cc | 1 + net/base/io_buffer.h | 1 + net/cert/cert_verify_proc_win.cc | 1 + net/cert/x509_cert_types_win.cc | 1 + net/cert/x509_certificate_win.cc | 1 + net/dns/address_sorter_win.cc | 1 + net/dns/dns_config_service_win.cc | 1 + net/dns/dns_config_service_win.h | 1 + net/dns/dns_config_service_win_unittest.cc | 1 + net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc | 1 + net/proxy/dhcp_proxy_script_fetcher_win.cc | 1 + printing/backend/print_backend_win.cc | 1 + printing/backend/win_helper.cc | 1 + printing/backend/win_helper.h | 1 + printing/printing_context_win.cc | 1 + sandbox/win/src/acl.cc | 1 + sandbox/win/src/acl.h | 1 + sandbox/win/src/handle_closer.cc | 1 + sandbox/win/src/process_policy_test.cc | 1 + sandbox/win/src/process_thread_policy.cc | 1 + sandbox/win/src/target_process.cc | 2 ++ sandbox/win/src/target_process.h | 1 + .../ozone/layout/xkb/xkb_keyboard_layout_engine.cc | 1 + .../ozone/layout/xkb/xkb_keyboard_layout_engine.h | 2 ++ ui/gfx/win/physical_size.cc | 1 + 50 files changed, 78 insertions(+), 16 deletions(-) create mode 100644 base/memory/free_deleter.h diff --git a/base/BUILD.gn b/base/BUILD.gn index ec259fd..35c4e33 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -457,6 +457,7 @@ component("base") { "memory/discardable_memory_allocator.h", "memory/discardable_shared_memory.cc", "memory/discardable_shared_memory.h", + "memory/free_deleter.h", "memory/linked_ptr.h", "memory/manual_constructor.h", "memory/memory_pressure_listener.cc", diff --git a/base/base.gypi b/base/base.gypi index dac46e2..413fc19 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -346,6 +346,7 @@ 'memory/discardable_memory_allocator.h', 'memory/discardable_shared_memory.cc', 'memory/discardable_shared_memory.h', + 'memory/free_deleter.h', 'memory/linked_ptr.h', 'memory/manual_constructor.h', 'memory/memory_pressure_listener.cc', diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc index 35cbb4e..0551784 100644 --- a/base/debug/stack_trace_posix.cc +++ b/base/debug/stack_trace_posix.cc @@ -21,6 +21,8 @@ #include #include +#include "base/memory/free_deleter.h" + #if defined(__GLIBCXX__) #include #endif diff --git a/base/file_version_info_win.h b/base/file_version_info_win.h index 6dd0202..9b59670 100644 --- a/base/file_version_info_win.h +++ b/base/file_version_info_win.h @@ -10,6 +10,7 @@ #include "base/base_export.h" #include "base/file_version_info.h" #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" struct tagVS_FIXEDFILEINFO; diff --git a/base/memory/free_deleter.h b/base/memory/free_deleter.h new file mode 100644 index 0000000..5604118 --- /dev/null +++ b/base/memory/free_deleter.h @@ -0,0 +1,25 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef BASE_MEMORY_FREE_DELETER_H_ +#define BASE_MEMORY_FREE_DELETER_H_ + +#include + +namespace base { + +// Function object which invokes 'free' on its parameter, which must be +// a pointer. Can be used to store malloc-allocated pointers in std::unique_ptr: +// +// std::unique_ptr foo_ptr( +// static_cast(malloc(sizeof(int)))); +struct FreeDeleter { + inline void operator()(void* ptr) const { + free(ptr); + } +}; + +} // namespace base + +#endif // BASE_MEMORY_FREE_DELETER_H_ diff --git a/base/memory/scoped_ptr.h b/base/memory/scoped_ptr.h index ec77952..50a4e09 100644 --- a/base/memory/scoped_ptr.h +++ b/base/memory/scoped_ptr.h @@ -96,21 +96,6 @@ #include -namespace base { - -// Function object which invokes 'free' on its parameter, which must be -// a pointer. Can be used to store malloc-allocated pointers in scoped_ptr: -// -// scoped_ptr foo_ptr( -// static_cast(malloc(sizeof(int)))); -struct FreeDeleter { - inline void operator()(void* ptr) const { - free(ptr); - } -}; - -} // namespace base - template > using scoped_ptr = std::unique_ptr; diff --git a/base/memory/shared_memory_win_unittest.cc b/base/memory/shared_memory_win_unittest.cc index 9dbefb5..a919962 100644 --- a/base/memory/shared_memory_win_unittest.cc +++ b/base/memory/shared_memory_win_unittest.cc @@ -6,6 +6,7 @@ #include #include "base/command_line.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "base/process/process.h" diff --git a/base/process/process_info_mac.cc b/base/process/process_info_mac.cc index 22c61a8..7583266 100644 --- a/base/process/process_info_mac.cc +++ b/base/process/process_info_mac.cc @@ -10,6 +10,7 @@ #include #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" diff --git a/base/security_unittest.cc b/base/security_unittest.cc index a82bc91..39ccdf5 100644 --- a/base/security_unittest.cc +++ b/base/security_unittest.cc @@ -15,6 +15,7 @@ #include "base/files/file_util.h" #include "base/logging.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc b/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc index db10631..c2531cd 100644 --- a/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc +++ b/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc @@ -7,6 +7,7 @@ #include #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/message_loop/message_loop.h" #include "base/sys_info.h" #include "build/build_config.h" diff --git a/chrome/common/chrome_paths_mac.mm b/chrome/common/chrome_paths_mac.mm index da39eac..db32629 100644 --- a/chrome/common/chrome_paths_mac.mm +++ b/chrome/common/chrome_paths_mac.mm @@ -13,6 +13,7 @@ #include "base/logging.h" #import "base/mac/foundation_util.h" #import "base/mac/scoped_nsautorelease_pool.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "build/build_config.h" diff --git a/chrome/service/cloud_print/cdd_conversion_win.cc b/chrome/service/cloud_print/cdd_conversion_win.cc index 480b74b..2aad275 100644 --- a/chrome/service/cloud_print/cdd_conversion_win.cc +++ b/chrome/service/cloud_print/cdd_conversion_win.cc @@ -6,6 +6,7 @@ #include +#include "base/memory/free_deleter.h" #include "base/strings/string_number_conversions.h" #include "components/cloud_devices/common/printer_description.h" #include "printing/backend/win_helper.h" diff --git a/chrome/service/cloud_print/cdd_conversion_win.h b/chrome/service/cloud_print/cdd_conversion_win.h index 0e9c3db..2d6cf8e 100644 --- a/chrome/service/cloud_print/cdd_conversion_win.h +++ b/chrome/service/cloud_print/cdd_conversion_win.h @@ -5,9 +5,11 @@ #ifndef CHROME_SERVICE_CLOUD_PRINT_CDD_CONVERSION_WIN_H_ #define CHROME_SERVICE_CLOUD_PRINT_CDD_CONVERSION_WIN_H_ -#include #include +#include + +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc index 02016cf..c9f5597 100644 --- a/chrome/service/cloud_print/print_system_win.cc +++ b/chrome/service/cloud_print/print_system_win.cc @@ -8,6 +8,7 @@ #include "base/files/file_util.h" #include "base/json/json_writer.h" #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" diff --git a/chromecast/base/bind_to_task_runner_unittest.cc b/chromecast/base/bind_to_task_runner_unittest.cc index 20f21c2..f4cb1a9 100644 --- a/chromecast/base/bind_to_task_runner_unittest.cc +++ b/chromecast/base/bind_to_task_runner_unittest.cc @@ -6,6 +6,7 @@ #include +#include "base/memory/free_deleter.h" #include "base/message_loop/message_loop.h" #include "base/synchronization/waitable_event.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc index 97e5da1..9a8216b 100644 --- a/components/exo/wayland/server.cc +++ b/components/exo/wayland/server.cc @@ -27,6 +27,7 @@ #include "base/cancelable_callback.h" #include "base/files/file_path.h" #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "components/exo/buffer.h" diff --git a/components/storage_monitor/storage_monitor_win_unittest.cc b/components/storage_monitor/storage_monitor_win_unittest.cc index b8f2487..0d94a1e 100644 --- a/components/storage_monitor/storage_monitor_win_unittest.cc +++ b/components/storage_monitor/storage_monitor_win_unittest.cc @@ -10,6 +10,7 @@ #include #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" diff --git a/content/browser/geolocation/wifi_data_provider_win.cc b/content/browser/geolocation/wifi_data_provider_win.cc index 4d950ec..7d9db58 100644 --- a/content/browser/geolocation/wifi_data_provider_win.cc +++ b/content/browser/geolocation/wifi_data_provider_win.cc @@ -27,6 +27,7 @@ #include #include +#include "base/memory/free_deleter.h" #include "base/metrics/histogram.h" #include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" diff --git a/courgette/assembly_program.h b/courgette/assembly_program.h index c256f8f..65147a8 100644 --- a/courgette/assembly_program.h +++ b/courgette/assembly_program.h @@ -13,6 +13,7 @@ #include #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "courgette/courgette.h" #include "courgette/image_utils.h" diff --git a/device/hid/hid_service_win.cc b/device/hid/hid_service_win.cc index 8a20060..6403c89 100644 --- a/device/hid/hid_service_win.cc +++ b/device/hid/hid_service_win.cc @@ -16,6 +16,7 @@ #include "base/bind.h" #include "base/files/file.h" #include "base/location.h" +#include "base/memory/free_deleter.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" diff --git a/extensions/browser/api/cast_channel/cast_framer.cc b/extensions/browser/api/cast_channel/cast_framer.cc index 6e3075d..a5dcf3e 100644 --- a/extensions/browser/api/cast_channel/cast_framer.cc +++ b/extensions/browser/api/cast_channel/cast_framer.cc @@ -8,6 +8,7 @@ #include +#include "base/memory/free_deleter.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h" #include "base/sys_byteorder.h" diff --git a/ipc/attachment_broker_mac_unittest.cc b/ipc/attachment_broker_mac_unittest.cc index 32d2833..98340fa 100644 --- a/ipc/attachment_broker_mac_unittest.cc +++ b/ipc/attachment_broker_mac_unittest.cc @@ -17,6 +17,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/mac/mac_util.h" #include "base/mac/mach_logging.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "base/strings/string_number_conversions.h" diff --git a/media/audio/alsa/alsa_output.cc b/media/audio/alsa/alsa_output.cc index 4ab571e..9216def 100644 --- a/media/audio/alsa/alsa_output.cc +++ b/media/audio/alsa/alsa_output.cc @@ -40,6 +40,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/memory/free_deleter.h" #include "base/stl_util.h" #include "base/trace_event/trace_event.h" #include "media/audio/alsa/alsa_util.h" diff --git a/media/audio/alsa/audio_manager_alsa.cc b/media/audio/alsa/audio_manager_alsa.cc index b32b4d7..5ddc425 100644 --- a/media/audio/alsa/audio_manager_alsa.cc +++ b/media/audio/alsa/audio_manager_alsa.cc @@ -11,6 +11,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/metrics/histogram.h" #include "base/nix/xdg_util.h" #include "base/process/launch.h" diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc index 78bdb9f..5425118 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc @@ -11,6 +11,7 @@ #include "base/mac/mac_logging.h" #include "base/mac/scoped_cftyperef.h" #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/power_monitor/power_monitor.h" #include "base/power_monitor/power_observer.h" #include "base/strings/sys_string_conversions.h" diff --git a/media/base/bind_to_current_loop_unittest.cc b/media/base/bind_to_current_loop_unittest.cc index abb3081..ba981d0 100644 --- a/media/base/bind_to_current_loop_unittest.cc +++ b/media/base/bind_to_current_loop_unittest.cc @@ -6,6 +6,7 @@ #include +#include "base/memory/free_deleter.h" #include "base/message_loop/message_loop.h" #include "base/synchronization/waitable_event.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/base/io_buffer.h b/net/base/io_buffer.h index 5e9ff21..9285791 100644 --- a/net/base/io_buffer.h +++ b/net/base/io_buffer.h @@ -9,6 +9,7 @@ #include +#include "base/memory/free_deleter.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/pickle.h" diff --git a/net/cert/cert_verify_proc_win.cc b/net/cert/cert_verify_proc_win.cc index 18c6187..86da034 100644 --- a/net/cert/cert_verify_proc_win.cc +++ b/net/cert/cert_verify_proc_win.cc @@ -7,6 +7,7 @@ #include #include +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/sha1.h" #include "base/strings/string_util.h" diff --git a/net/cert/x509_cert_types_win.cc b/net/cert/x509_cert_types_win.cc index 1ec64c0..70236bb 100644 --- a/net/cert/x509_cert_types_win.cc +++ b/net/cert/x509_cert_types_win.cc @@ -7,6 +7,7 @@ #include #include "base/logging.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/net/cert/x509_certificate_win.cc b/net/cert/x509_certificate_win.cc index d207782..86be991 100644 --- a/net/cert/x509_certificate_win.cc +++ b/net/cert/x509_certificate_win.cc @@ -5,6 +5,7 @@ #include "net/cert/x509_certificate.h" #include "base/logging.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/numerics/safe_conversions.h" #include "base/pickle.h" diff --git a/net/dns/address_sorter_win.cc b/net/dns/address_sorter_win.cc index aca4697..2323698 100644 --- a/net/dns/address_sorter_win.cc +++ b/net/dns/address_sorter_win.cc @@ -12,6 +12,7 @@ #include "base/location.h" #include "base/logging.h" #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/threading/worker_pool.h" #include "base/win/windows_version.h" #include "net/base/address_list.h" diff --git a/net/dns/dns_config_service_win.cc b/net/dns/dns_config_service_win.cc index 35358f4..46433a6 100644 --- a/net/dns/dns_config_service_win.cc +++ b/net/dns/dns_config_service_win.cc @@ -14,6 +14,7 @@ #include "base/files/file_path_watcher.h" #include "base/logging.h" #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_split.h" diff --git a/net/dns/dns_config_service_win.h b/net/dns/dns_config_service_win.h index 96d4713..0485afd 100644 --- a/net/dns/dns_config_service_win.h +++ b/net/dns/dns_config_service_win.h @@ -14,6 +14,7 @@ #include #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" diff --git a/net/dns/dns_config_service_win_unittest.cc b/net/dns/dns_config_service_win_unittest.cc index 87be751..30bd418 100644 --- a/net/dns/dns_config_service_win_unittest.cc +++ b/net/dns/dns_config_service_win_unittest.cc @@ -5,6 +5,7 @@ #include "net/dns/dns_config_service_win.h" #include "base/logging.h" +#include "base/memory/free_deleter.h" #include "base/win/windows_version.h" #include "net/base/ip_address.h" #include "net/dns/dns_protocol.h" diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc index 23c02df..32e8ad4 100644 --- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc +++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc @@ -8,6 +8,7 @@ #include "base/bind_helpers.h" #include "base/location.h" #include "base/logging.h" +#include "base/memory/free_deleter.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/task_runner.h" diff --git a/net/proxy/dhcp_proxy_script_fetcher_win.cc b/net/proxy/dhcp_proxy_script_fetcher_win.cc index 263b50f..03a6c6f 100644 --- a/net/proxy/dhcp_proxy_script_fetcher_win.cc +++ b/net/proxy/dhcp_proxy_script_fetcher_win.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/profiler/scoped_tracker.h" #include "base/threading/sequenced_worker_pool.h" diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc index f53f55d..a8140d5 100644 --- a/printing/backend/print_backend_win.cc +++ b/printing/backend/print_backend_win.cc @@ -8,6 +8,7 @@ #include #include +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h" diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc index eed998e..5b55ea9 100644 --- a/printing/backend/win_helper.cc +++ b/printing/backend/win_helper.cc @@ -12,6 +12,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_util.h" diff --git a/printing/backend/win_helper.h b/printing/backend/win_helper.h index d79e602..fa39a03 100644 --- a/printing/backend/win_helper.h +++ b/printing/backend/win_helper.h @@ -13,6 +13,7 @@ #include #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/win/scoped_handle.h" diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc index 8a6dc17a..ffd2bc0 100644 --- a/printing/printing_context_win.cc +++ b/printing/printing_context_win.cc @@ -7,6 +7,7 @@ #include #include "base/bind.h" +#include "base/memory/free_deleter.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "printing/backend/print_backend.h" diff --git a/sandbox/win/src/acl.cc b/sandbox/win/src/acl.cc index f140c7e..324f86d 100644 --- a/sandbox/win/src/acl.cc +++ b/sandbox/win/src/acl.cc @@ -8,6 +8,7 @@ #include #include "base/logging.h" +#include "base/memory/free_deleter.h" namespace sandbox { diff --git a/sandbox/win/src/acl.h b/sandbox/win/src/acl.h index b5021e7..46d227d 100644 --- a/sandbox/win/src/acl.h +++ b/sandbox/win/src/acl.h @@ -8,6 +8,7 @@ #include #include +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "sandbox/win/src/sid.h" diff --git a/sandbox/win/src/handle_closer.cc b/sandbox/win/src/handle_closer.cc index f2012b7..962e441 100644 --- a/sandbox/win/src/handle_closer.cc +++ b/sandbox/win/src/handle_closer.cc @@ -7,6 +7,7 @@ #include #include "base/logging.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/win/windows_version.h" #include "sandbox/win/src/interceptors.h" diff --git a/sandbox/win/src/process_policy_test.cc b/sandbox/win/src/process_policy_test.cc index 779cd15..5876781 100644 --- a/sandbox/win/src/process_policy_test.cc +++ b/sandbox/win/src/process_policy_test.cc @@ -5,6 +5,7 @@ #include #include +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/strings/sys_string_conversions.h" diff --git a/sandbox/win/src/process_thread_policy.cc b/sandbox/win/src/process_thread_policy.cc index 11928c8..514e7d6 100644 --- a/sandbox/win/src/process_thread_policy.cc +++ b/sandbox/win/src/process_thread_policy.cc @@ -8,6 +8,7 @@ #include +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "sandbox/win/src/ipc_tags.h" #include "sandbox/win/src/nt_internals.h" diff --git a/sandbox/win/src/target_process.cc b/sandbox/win/src/target_process.cc index d8ff0a1..2e0376f 100644 --- a/sandbox/win/src/target_process.cc +++ b/sandbox/win/src/target_process.cc @@ -6,9 +6,11 @@ #include #include + #include #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/win/pe_image.h" #include "base/win/startup_information.h" diff --git a/sandbox/win/src/target_process.h b/sandbox/win/src/target_process.h index c00f2ce..547d414 100644 --- a/sandbox/win/src/target_process.h +++ b/sandbox/win/src/target_process.h @@ -10,6 +10,7 @@ #include #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/win/scoped_handle.h" #include "base/win/scoped_process_information.h" diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc index 9367b62..0baefd4 100644 --- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc +++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc @@ -13,6 +13,7 @@ #include "base/location.h" #include "base/logging.h" #include "base/macros.h" +#include "base/memory/free_deleter.h" #include "base/single_thread_task_runner.h" #include "base/task_runner.h" #include "base/thread_task_runner_handle.h" diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h index c485ecd..ef52db7 100644 --- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h +++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h @@ -7,9 +7,11 @@ #include #include + #include #include "base/containers/hash_tables.h" +#include "base/memory/free_deleter.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/ui/gfx/win/physical_size.cc b/ui/gfx/win/physical_size.cc index cc1fc14..2aa0c3f 100644 --- a/ui/gfx/win/physical_size.cc +++ b/ui/gfx/win/physical_size.cc @@ -10,6 +10,7 @@ #include #include "base/logging.h" +#include "base/memory/free_deleter.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_generic.h" #include "base/strings/utf_string_conversions.h" -- cgit v1.1