diff options
95 files changed, 98 insertions, 97 deletions
diff --git a/base/base.gypi b/base/base.gypi index e77d20f..6f2a53a 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -123,7 +123,6 @@ 'debug/trace_event_impl.cc', 'debug/trace_event_impl.h', 'debug/trace_event_win.cc', - 'eintr_wrapper.h', 'environment.cc', 'environment.h', 'file_descriptor_posix.h', @@ -309,6 +308,7 @@ 'platform_file_posix.cc', 'platform_file_win.cc', 'port.h', + 'posix/eintr_wrapper.h', 'posix/global_descriptors.cc', 'posix/global_descriptors.h', 'posix/unix_domain_socket.cc', diff --git a/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc index 4a95f3a..0fbefde 100644 --- a/base/debug/debugger_posix.cc +++ b/base/debug/debugger_posix.cc @@ -40,9 +40,9 @@ #include <ostream> #include "base/basictypes.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/posix/eintr_wrapper.h" #include "base/safe_strerror_posix.h" #include "base/string_piece.h" #include "base/stringprintf.h" diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc index 661fdb7..6c90b2b 100644 --- a/base/debug/stack_trace_posix.cc +++ b/base/debug/stack_trace_posix.cc @@ -27,9 +27,9 @@ #include "base/basictypes.h" #include "base/debug/debugger.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/posix/eintr_wrapper.h" #include "base/string_number_conversions.h" #if defined(USE_SYMBOLIZE) diff --git a/base/file_util.h b/base/file_util.h index ef67b4d..8e92879 100644 --- a/base/file_util.h +++ b/base/file_util.h @@ -32,9 +32,9 @@ #include "base/string16.h" #if defined(OS_POSIX) -#include "base/eintr_wrapper.h" #include "base/file_descriptor_posix.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #endif namespace base { diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc index 15d2213..7722a5e 100644 --- a/base/file_util_posix.cc +++ b/base/file_util_posix.cc @@ -32,12 +32,12 @@ #include <fstream> #include "base/basictypes.h" -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/path_service.h" +#include "base/posix/eintr_wrapper.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/base/files/dir_reader_linux.h b/base/files/dir_reader_linux.h index 8dd3530..3e0721e 100644 --- a/base/files/dir_reader_linux.h +++ b/base/files/dir_reader_linux.h @@ -12,7 +12,7 @@ #include <unistd.h> #include "base/logging.h" -#include "base/eintr_wrapper.h" +#include "base/posix/eintr_wrapper.h" // See the comments in dir_reader_posix.h about this. diff --git a/base/files/file_path_watcher_linux.cc b/base/files/file_path_watcher_linux.cc index 1438539..b4a7136 100644 --- a/base/files/file_path_watcher_linux.cc +++ b/base/files/file_path_watcher_linux.cc @@ -17,7 +17,6 @@ #include <vector> #include "base/bind.h" -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/hash_tables.h" @@ -27,6 +26,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" +#include "base/posix/eintr_wrapper.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" diff --git a/base/logging.cc b/base/logging.cc index 7f9caff..bc0a5aa 100644 --- a/base/logging.cc +++ b/base/logging.cc @@ -49,7 +49,7 @@ typedef pthread_mutex_t* MutexHandle; #include "base/debug/alias.h" #include "base/debug/debugger.h" #include "base/debug/stack_trace.h" -#include "base/eintr_wrapper.h" +#include "base/posix/eintr_wrapper.h" #include "base/string_piece.h" #include "base/synchronization/lock_impl.h" #include "base/threading/platform_thread.h" diff --git a/base/mac/authorization_util.mm b/base/mac/authorization_util.mm index a9fac3e..62a2074 100644 --- a/base/mac/authorization_util.mm +++ b/base/mac/authorization_util.mm @@ -10,12 +10,12 @@ #include <string> #include "base/basictypes.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_logging.h" #import "base/mac/mac_util.h" #include "base/mac/scoped_authorizationref.h" +#include "base/posix/eintr_wrapper.h" #include "base/string_number_conversions.h" #include "base/string_util.h" diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc index e8abb1a..62721d3 100644 --- a/base/message_loop_unittest.cc +++ b/base/message_loop_unittest.cc @@ -7,10 +7,10 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" +#include "base/posix/eintr_wrapper.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" #include "base/threading/platform_thread.h" diff --git a/base/message_pump_glib.cc b/base/message_pump_glib.cc index 99d1eee..f2201eb 100644 --- a/base/message_pump_glib.cc +++ b/base/message_pump_glib.cc @@ -9,8 +9,8 @@ #include <glib.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/threading/platform_thread.h" namespace { diff --git a/base/message_pump_libevent.cc b/base/message_pump_libevent.cc index b948cc0..45e1bdb 100644 --- a/base/message_pump_libevent.cc +++ b/base/message_pump_libevent.cc @@ -10,13 +10,13 @@ #include "base/auto_reset.h" #include "base/compiler_specific.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" #endif #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" +#include "base/posix/eintr_wrapper.h" #include "base/time.h" #if defined(USE_SYSTEM_LIBEVENT) #include <event.h> diff --git a/base/message_pump_libevent_unittest.cc b/base/message_pump_libevent_unittest.cc index b94b382..94245ce 100644 --- a/base/message_pump_libevent_unittest.cc +++ b/base/message_pump_libevent_unittest.cc @@ -6,8 +6,8 @@ #include <unistd.h> -#include "base/eintr_wrapper.h" #include "base/message_loop.h" +#include "base/posix/eintr_wrapper.h" #include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/platform_file_posix.cc b/base/platform_file_posix.cc index 83cf622..af79198 100644 --- a/base/platform_file_posix.cc +++ b/base/platform_file_posix.cc @@ -9,9 +9,9 @@ #include <sys/stat.h> #include <unistd.h> -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" diff --git a/base/eintr_wrapper.h b/base/posix/eintr_wrapper.h index a1b7f7b..1f3b59a 100644 --- a/base/eintr_wrapper.h +++ b/base/posix/eintr_wrapper.h @@ -7,8 +7,8 @@ // // On Windows, this wrapper macro does nothing. -#ifndef BASE_EINTR_WRAPPER_H_ -#define BASE_EINTR_WRAPPER_H_ +#ifndef BASE_POSIX_EINTR_WRAPPER_H_ +#define BASE_POSIX_EINTR_WRAPPER_H_ #include "build/build_config.h" @@ -30,4 +30,4 @@ #endif // OS_POSIX -#endif // BASE_EINTR_WRAPPER_H_ +#endif // BASE_POSIX_EINTR_WRAPPER_H_ diff --git a/base/posix/file_descriptor_shuffle.cc b/base/posix/file_descriptor_shuffle.cc index 0dde958..b5b7339 100644 --- a/base/posix/file_descriptor_shuffle.cc +++ b/base/posix/file_descriptor_shuffle.cc @@ -8,7 +8,7 @@ #include <stddef.h> #include <ostream> -#include "base/eintr_wrapper.h" +#include "base/posix/eintr_wrapper.h" #include "base/logging.h" namespace base { diff --git a/base/posix/unix_domain_socket.cc b/base/posix/unix_domain_socket.cc index bd11292..730657d 100644 --- a/base/posix/unix_domain_socket.cc +++ b/base/posix/unix_domain_socket.cc @@ -9,9 +9,9 @@ #include <sys/uio.h> #include <sys/socket.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/pickle.h" +#include "base/posix/eintr_wrapper.h" #include "base/stl_util.h" const size_t UnixDomainSocket::kMaxFileDescriptors = 16; diff --git a/base/process_util_mac.mm b/base/process_util_mac.mm index 65a390f..383dacf 100644 --- a/base/process_util_mac.mm +++ b/base/process_util_mac.mm @@ -28,13 +28,13 @@ #include <string> #include "base/debug/debugger.h" -#include "base/eintr_wrapper.h" #include "base/file_util.h" #include "base/hash_tables.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_mach_port.h" +#include "base/posix/eintr_wrapper.h" #include "base/string_util.h" #include "base/sys_info.h" #include "base/threading/thread_local.h" diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc index 3d5c930..a19cc2a 100644 --- a/base/process_util_posix.cc +++ b/base/process_util_posix.cc @@ -22,11 +22,11 @@ #include "base/compiler_specific.h" #include "base/debug/debugger.h" #include "base/debug/stack_trace.h" -#include "base/eintr_wrapper.h" #include "base/file_util.h" #include "base/files/dir_reader_posix.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/posix/eintr_wrapper.h" #include "base/process_util.h" #include "base/stringprintf.h" #include "base/synchronization/waitable_event.h" diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc index 0242479..6582073 100644 --- a/base/process_util_unittest.cc +++ b/base/process_util_unittest.cc @@ -9,11 +9,11 @@ #include "base/command_line.h" #include "base/debug/alias.h" #include "base/debug/stack_trace.h" -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" +#include "base/posix/eintr_wrapper.h" #include "base/process_util.h" #include "base/test/multiprocess_test.h" #include "base/test/test_timeouts.h" diff --git a/chrome/app/breakpad_linux.cc b/chrome/app/breakpad_linux.cc index b9ecce7..7dbda01 100644 --- a/chrome/app/breakpad_linux.cc +++ b/chrome/app/breakpad_linux.cc @@ -24,10 +24,10 @@ #include <string> #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/linux_util.h" #include "base/path_service.h" +#include "base/posix/eintr_wrapper.h" #include "base/posix/global_descriptors.h" #include "base/process_util.h" #include "base/string_util.h" diff --git a/chrome/app/nacl_fork_delegate_linux.cc b/chrome/app/nacl_fork_delegate_linux.cc index 7ff1465..69514bd 100644 --- a/chrome/app/nacl_fork_delegate_linux.cc +++ b/chrome/app/nacl_fork_delegate_linux.cc @@ -13,10 +13,10 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/file_path.h" #include "base/path_service.h" +#include "base/posix/eintr_wrapper.h" #include "base/posix/unix_domain_socket.h" #include "base/process_util.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" diff --git a/chrome/browser/chrome_browser_main_posix.cc b/chrome/browser/chrome_browser_main_posix.cc index 3fac661..8b3e94a 100644 --- a/chrome/browser/chrome_browser_main_posix.cc +++ b/chrome/browser/chrome_browser_main_posix.cc @@ -15,8 +15,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/string_number_conversions.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/chromeos/external_metrics.cc b/chrome/browser/chromeos/external_metrics.cc index ccc12b5..1c8ac7a 100644 --- a/chrome/browser/chromeos/external_metrics.cc +++ b/chrome/browser/chromeos/external_metrics.cc @@ -17,10 +17,10 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/eintr_wrapper.h" #include "base/metrics/histogram.h" #include "base/metrics/statistics_recorder.h" #include "base/perftimer.h" +#include "base/posix/eintr_wrapper.h" #include "base/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/metrics_service.h" diff --git a/chrome/browser/chromeos/process_proxy/process_output_watcher.cc b/chrome/browser/chromeos/process_proxy/process_output_watcher.cc index d7d719e..9c5191c 100644 --- a/chrome/browser/chromeos/process_proxy/process_output_watcher.cc +++ b/chrome/browser/chromeos/process_proxy/process_output_watcher.cc @@ -12,8 +12,8 @@ #include <sys/select.h> #include <unistd.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" namespace { diff --git a/chrome/browser/chromeos/process_proxy/process_output_watcher_unittest.cc b/chrome/browser/chromeos/process_proxy/process_output_watcher_unittest.cc index 91112c2..0dfc332 100644 --- a/chrome/browser/chromeos/process_proxy/process_output_watcher_unittest.cc +++ b/chrome/browser/chromeos/process_proxy/process_output_watcher_unittest.cc @@ -11,8 +11,8 @@ #include <sys/wait.h> #include "base/bind.h" -#include "base/eintr_wrapper.h" #include "base/file_util.h" +#include "base/posix/eintr_wrapper.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "chrome/browser/chromeos/process_proxy/process_output_watcher.h" diff --git a/chrome/browser/chromeos/process_proxy/process_proxy.cc b/chrome/browser/chromeos/process_proxy/process_proxy.cc index 436eb5b..b0d627a 100644 --- a/chrome/browser/chromeos/process_proxy/process_proxy.cc +++ b/chrome/browser/chromeos/process_proxy/process_proxy.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/file_util.h" +#include "base/posix/eintr_wrapper.h" #include "base/process_util.h" #include "base/logging.h" #include "base/threading/thread.h" diff --git a/chrome/browser/chromeos/process_proxy/process_proxy_browsertest.cc b/chrome/browser/chromeos/process_proxy/process_proxy_browsertest.cc index 2b88aa7..8446870 100644 --- a/chrome/browser/chromeos/process_proxy/process_proxy_browsertest.cc +++ b/chrome/browser/chromeos/process_proxy/process_proxy_browsertest.cc @@ -8,9 +8,9 @@ #include <sys/wait.h> #include "base/bind.h" -#include "base/eintr_wrapper.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/posix/eintr_wrapper.h" #include "base/process_util.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" diff --git a/chrome/browser/crash_handler_host_linux.cc b/chrome/browser/crash_handler_host_linux.cc index 8784087..cdf2927 100644 --- a/chrome/browser/crash_handler_host_linux.cc +++ b/chrome/browser/crash_handler_host_linux.cc @@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/format_macros.h" #include "base/linux_util.h" @@ -20,6 +19,7 @@ #include "base/memory/singleton.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/posix/eintr_wrapper.h" #include "base/rand_util.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc b/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc index e7cbce7..ba7bc9b 100644 --- a/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc +++ b/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc @@ -5,9 +5,9 @@ #include "chrome/browser/extensions/api/messaging/native_process_launcher.h" #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/process_util.h" namespace extensions { diff --git a/chrome/browser/mac/relauncher.cc b/chrome/browser/mac/relauncher.cc index d028d3e..ef24660 100644 --- a/chrome/browser/mac/relauncher.cc +++ b/chrome/browser/mac/relauncher.cc @@ -18,13 +18,13 @@ #include <vector> #include "base/basictypes.h" -#include "base/eintr_wrapper.h" #include "base/file_util.h" #include "base/logging.h" #include "base/mac/mac_logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/path_service.h" +#include "base/posix/eintr_wrapper.h" #include "base/process_util.h" #include "base/stringprintf.h" #include "base/sys_string_conversions.h" diff --git a/chrome/browser/process_info_snapshot_mac_unittest.cc b/chrome/browser/process_info_snapshot_mac_unittest.cc index ec44a83..f6cf7b1 100644 --- a/chrome/browser/process_info_snapshot_mac_unittest.cc +++ b/chrome/browser/process_info_snapshot_mac_unittest.cc @@ -10,9 +10,9 @@ #include <vector> #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/process_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index a31297b..583f4bf 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -59,12 +59,12 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/posix/eintr_wrapper.h" #include "base/process_util.h" #include "base/rand_util.h" #include "base/safe_strerror_posix.h" diff --git a/chrome/browser/process_singleton_mac.cc b/chrome/browser/process_singleton_mac.cc index 6b62479..253f369 100644 --- a/chrome/browser/process_singleton_mac.cc +++ b/chrome/browser/process_singleton_mac.cc @@ -8,9 +8,9 @@ #include "chrome/browser/process_singleton.h" -#include "base/eintr_wrapper.h" #include "base/file_util.h" #include "base/metrics/histogram.h" +#include "base/posix/eintr_wrapper.h" #include "chrome/common/chrome_constants.h" namespace { diff --git a/chrome/browser/process_singleton_mac_unittest.cc b/chrome/browser/process_singleton_mac_unittest.cc index 680b04c..39451df 100644 --- a/chrome/browser/process_singleton_mac_unittest.cc +++ b/chrome/browser/process_singleton_mac_unittest.cc @@ -8,9 +8,9 @@ #include "chrome/browser/process_singleton.h" -#include "base/eintr_wrapper.h" #include "base/file_util.h" #include "base/path_service.h" +#include "base/posix/eintr_wrapper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc index e478893..9bde5da 100644 --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc @@ -16,13 +16,13 @@ #include "base/base_paths.h" #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/environment.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/i18n/file_util_icu.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/posix/eintr_wrapper.h" #include "base/process_util.h" #include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" diff --git a/chrome/common/multi_process_lock_linux.cc b/chrome/common/multi_process_lock_linux.cc index f610237..52fc2ba9 100644 --- a/chrome/common/multi_process_lock_linux.cc +++ b/chrome/common/multi_process_lock_linux.cc @@ -9,8 +9,8 @@ #include <sys/un.h> #include <unistd.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" class MultiProcessLockLinux : public MultiProcessLock { public: diff --git a/chrome/common/service_process_util_posix.cc b/chrome/common/service_process_util_posix.cc index fa793a6..e41218f 100644 --- a/chrome/common/service_process_util_posix.cc +++ b/chrome/common/service_process_util_posix.cc @@ -6,8 +6,8 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/eintr_wrapper.h" #include "base/message_loop_proxy.h" +#include "base/posix/eintr_wrapper.h" #include "base/synchronization/waitable_event.h" #include "chrome/common/multi_process_lock.h" diff --git a/chrome/nacl/nacl_helper_linux.cc b/chrome/nacl/nacl_helper_linux.cc index 00770d5..967162d 100644 --- a/chrome/nacl/nacl_helper_linux.cc +++ b/chrome/nacl/nacl_helper_linux.cc @@ -18,10 +18,10 @@ #include "base/at_exit.h" #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/json/string_escape.h" #include "base/logging.h" #include "base/message_loop.h" +#include "base/posix/eintr_wrapper.h" #include "base/posix/global_descriptors.h" #include "base/posix/unix_domain_socket.h" #include "base/rand_util.h" diff --git a/chromeos/dbus/debug_daemon_client.cc b/chromeos/dbus/debug_daemon_client.cc index bd42bd8..c9212d3 100644 --- a/chromeos/dbus/debug_daemon_client.cc +++ b/chromeos/dbus/debug_daemon_client.cc @@ -10,10 +10,10 @@ #include "base/bind.h" #include "base/callback.h" #include "base/chromeos/chromeos_version.h" -#include "base/eintr_wrapper.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" #include "base/platform_file.h" +#include "base/posix/eintr_wrapper.h" #include "base/string_util.h" #include "base/threading/worker_pool.h" #include "dbus/bus.h" diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc index fb340b4..0e54824 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc @@ -13,8 +13,8 @@ #include <unistd.h> #include "base/debug/trace_event.h" -#include "base/eintr_wrapper.h" #include "base/message_loop.h" +#include "base/posix/eintr_wrapper.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/content/browser/renderer_host/render_sandbox_host_linux.cc b/content/browser/renderer_host/render_sandbox_host_linux.cc index 47fe315..d9c9e2e 100644 --- a/content/browser/renderer_host/render_sandbox_host_linux.cc +++ b/content/browser/renderer_host/render_sandbox_host_linux.cc @@ -17,11 +17,11 @@ #include <vector> #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/linux_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/pickle.h" +#include "base/posix/eintr_wrapper.h" #include "base/posix/unix_domain_socket.h" #include "base/process_util.h" #include "base/shared_memory.h" diff --git a/content/browser/renderer_host/render_widget_helper.cc b/content/browser/renderer_host/render_widget_helper.cc index b7e1d4a..e198a31 100644 --- a/content/browser/renderer_host/render_widget_helper.cc +++ b/content/browser/renderer_host/render_widget_helper.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/eintr_wrapper.h" #include "base/lazy_instance.h" +#include "base/posix/eintr_wrapper.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "content/browser/gpu/gpu_surface_tracker.h" diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc index bbe1efe..2e39af2 100644 --- a/content/browser/zygote_host/zygote_host_impl_linux.cc +++ b/content/browser/zygote_host/zygote_host_impl_linux.cc @@ -11,7 +11,6 @@ #include "base/base_switches.h" #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/environment.h" #include "base/file_util.h" #include "base/linux_util.h" @@ -20,6 +19,7 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/posix/eintr_wrapper.h" #include "base/posix/unix_domain_socket.h" #include "base/process_util.h" #include "base/string_number_conversions.h" diff --git a/content/common/child_process_sandbox_support_impl_linux.cc b/content/common/child_process_sandbox_support_impl_linux.cc index 8d1b8d5..7d25180 100644 --- a/content/common/child_process_sandbox_support_impl_linux.cc +++ b/content/common/child_process_sandbox_support_impl_linux.cc @@ -6,9 +6,9 @@ #include <sys/stat.h> -#include "base/eintr_wrapper.h" #include "base/memory/scoped_ptr.h" #include "base/pickle.h" +#include "base/posix/eintr_wrapper.h" #include "base/posix/unix_domain_socket.h" #include "content/common/sandbox_linux.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/linux/WebFontFamily.h" diff --git a/content/common/sandbox_linux.cc b/content/common/sandbox_linux.cc index 640fc87..fcc8cb7 100644 --- a/content/common/sandbox_linux.cc +++ b/content/common/sandbox_linux.cc @@ -9,10 +9,10 @@ #include <sys/types.h> #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/file_util.h" #include "base/logging.h" #include "base/memory/singleton.h" +#include "base/posix/eintr_wrapper.h" #include "base/time.h" #include "content/common/sandbox_linux.h" #include "content/common/seccomp_sandbox.h" diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc index 36dd194..c579ea9 100644 --- a/content/plugin/plugin_channel.cc +++ b/content/plugin/plugin_channel.cc @@ -20,7 +20,7 @@ #include "webkit/plugins/npapi/plugin_instance.h" #if defined(OS_POSIX) -#include "base/eintr_wrapper.h" +#include "base/posix/eintr_wrapper.h" #include "ipc/ipc_channel_posix.h" #endif diff --git a/content/zygote/zygote_linux.cc b/content/zygote/zygote_linux.cc index 7d473a1..a5fb203 100644 --- a/content/zygote/zygote_linux.cc +++ b/content/zygote/zygote_linux.cc @@ -19,9 +19,9 @@ #include "base/debug/trace_event.h" #include "base/file_util.h" #include "base/linux_util.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/pickle.h" +#include "base/posix/eintr_wrapper.h" #include "base/posix/global_descriptors.h" #include "base/posix/unix_domain_socket.h" #include "content/common/set_process_title.h" diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc index a710dab..d8f2ed9 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -14,12 +14,12 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/hash_tables.h" #include "base/linux_util.h" #include "base/memory/scoped_ptr.h" #include "base/pickle.h" +#include "base/posix/eintr_wrapper.h" #include "base/posix/unix_domain_socket.h" #include "base/process_util.h" #include "base/rand_util.h" diff --git a/dbus/message_unittest.cc b/dbus/message_unittest.cc index c61f170..7e4455a8 100644 --- a/dbus/message_unittest.cc +++ b/dbus/message_unittest.cc @@ -5,9 +5,9 @@ #include "dbus/message.h" #include "base/basictypes.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/posix/eintr_wrapper.h" #include "dbus/object_path.h" #include "dbus/test_proto.pb.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ipc/file_descriptor_set_posix.cc b/ipc/file_descriptor_set_posix.cc index b85d0a4..3cb5880 100644 --- a/ipc/file_descriptor_set_posix.cc +++ b/ipc/file_descriptor_set_posix.cc @@ -8,8 +8,8 @@ #include <sys/stat.h> #include <unistd.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" FileDescriptorSet::FileDescriptorSet() : consumed_descriptor_highwater_(0) { diff --git a/ipc/file_descriptor_set_posix_unittest.cc b/ipc/file_descriptor_set_posix_unittest.cc index fdb00f51..b4a0141 100644 --- a/ipc/file_descriptor_set_posix_unittest.cc +++ b/ipc/file_descriptor_set_posix_unittest.cc @@ -10,7 +10,7 @@ #include <fcntl.h> #include "base/basictypes.h" -#include "base/eintr_wrapper.h" +#include "base/posix/eintr_wrapper.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index 9273dcb..fc15881 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -21,13 +21,13 @@ #include <map> #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" +#include "base/posix/eintr_wrapper.h" #include "base/posix/global_descriptors.h" #include "base/process_util.h" #include "base/rand_util.h" diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc index f8842c3..0484f07 100644 --- a/ipc/ipc_channel_posix_unittest.cc +++ b/ipc/ipc_channel_posix_unittest.cc @@ -12,12 +12,12 @@ #include <unistd.h> #include "base/basictypes.h" -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/posix/eintr_wrapper.h" #include "base/test/multiprocess_test.h" #include "base/test/test_timeouts.h" #include "ipc/ipc_listener.h" diff --git a/ipc/ipc_send_fds_test.cc b/ipc/ipc_send_fds_test.cc index 47c6dd1..eeee56b 100644 --- a/ipc/ipc_send_fds_test.cc +++ b/ipc/ipc_send_fds_test.cc @@ -14,8 +14,8 @@ extern "C" { #include <fcntl.h> #include <sys/stat.h> -#include "base/eintr_wrapper.h" #include "base/message_loop.h" +#include "base/posix/eintr_wrapper.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_message_utils.h" #include "ipc/ipc_multiprocess_test.h" diff --git a/media/audio/async_socket_io_handler_posix.cc b/media/audio/async_socket_io_handler_posix.cc index 1729b7d..eeec7c1 100644 --- a/media/audio/async_socket_io_handler_posix.cc +++ b/media/audio/async_socket_io_handler_posix.cc @@ -5,7 +5,8 @@ #include "media/audio/async_socket_io_handler.h" #include <fcntl.h> -#include "base/eintr_wrapper.h" + +#include "base/posix/eintr_wrapper.h" namespace media { diff --git a/net/base/address_tracker_linux.cc b/net/base/address_tracker_linux.cc index af2a88d..52bc928 100644 --- a/net/base/address_tracker_linux.cc +++ b/net/base/address_tracker_linux.cc @@ -6,8 +6,8 @@ #include <errno.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "net/base/network_change_notifier_linux.h" namespace net { diff --git a/net/base/file_stream_context_posix.cc b/net/base/file_stream_context_posix.cc index 8316215..0c16ef4 100644 --- a/net/base/file_stream_context_posix.cc +++ b/net/base/file_stream_context_posix.cc @@ -17,11 +17,11 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram.h" +#include "base/posix/eintr_wrapper.h" #include "base/task_runner_util.h" #include "base/threading/worker_pool.h" #include "net/base/io_buffer.h" diff --git a/net/base/net_util_posix.cc b/net/base/net_util_posix.cc index ecea33f..0829a71 100644 --- a/net/base/net_util_posix.cc +++ b/net/base/net_util_posix.cc @@ -6,9 +6,9 @@ #include <sys/types.h> -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/threading/thread_restrictions.h" diff --git a/net/base/stream_listen_socket.cc b/net/base/stream_listen_socket.cc index fc82b8a..7168df3 100644 --- a/net/base/stream_listen_socket.cc +++ b/net/base/stream_listen_socket.cc @@ -17,10 +17,10 @@ #include "net/base/net_errors.h" #endif -#include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/posix/eintr_wrapper.h" #include "base/sys_byteorder.h" #include "base/threading/platform_thread.h" #include "build/build_config.h" diff --git a/net/base/tcp_listen_socket_unittest.cc b/net/base/tcp_listen_socket_unittest.cc index 5ef44d1..6a6e6aa 100644 --- a/net/base/tcp_listen_socket_unittest.cc +++ b/net/base/tcp_listen_socket_unittest.cc @@ -8,7 +8,7 @@ #include <sys/types.h> #include "base/bind.h" -#include "base/eintr_wrapper.h" +#include "base/posix/eintr_wrapper.h" #include "base/sys_byteorder.h" #include "net/base/net_util.h" #include "testing/platform_test.h" diff --git a/net/base/unix_domain_socket_posix.cc b/net/base/unix_domain_socket_posix.cc index d852ed8..819b94c 100644 --- a/net/base/unix_domain_socket_posix.cc +++ b/net/base/unix_domain_socket_posix.cc @@ -16,7 +16,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/eintr_wrapper.h" +#include "base/posix/eintr_wrapper.h" #include "base/threading/platform_thread.h" #include "build/build_config.h" #include "net/base/net_errors.h" diff --git a/net/base/unix_domain_socket_posix_unittest.cc b/net/base/unix_domain_socket_posix_unittest.cc index e72ac59..bad626f 100644 --- a/net/base/unix_domain_socket_posix_unittest.cc +++ b/net/base/unix_domain_socket_posix_unittest.cc @@ -19,12 +19,12 @@ #include "base/bind.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/posix/eintr_wrapper.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/threading/platform_thread.h" diff --git a/net/dns/address_sorter_posix.cc b/net/dns/address_sorter_posix.cc index 807cbf8..51ef35e 100644 --- a/net/dns/address_sorter_posix.cc +++ b/net/dns/address_sorter_posix.cc @@ -17,9 +17,9 @@ #include <algorithm> -#include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/memory/scoped_vector.h" +#include "base/posix/eintr_wrapper.h" #include "net/socket/client_socket_factory.h" #include "net/udp/datagram_client_socket.h" diff --git a/net/dns/notify_watcher_mac.cc b/net/dns/notify_watcher_mac.cc index 07abbe4..67cee01 100644 --- a/net/dns/notify_watcher_mac.cc +++ b/net/dns/notify_watcher_mac.cc @@ -6,8 +6,8 @@ #include <notify.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" namespace net { diff --git a/net/socket/tcp_client_socket_libevent.cc b/net/socket/tcp_client_socket_libevent.cc index 85b9fb4..63d937c 100644 --- a/net/socket/tcp_client_socket_libevent.cc +++ b/net/socket/tcp_client_socket_libevent.cc @@ -13,10 +13,10 @@ #include <netinet/in.h> #endif -#include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/stats_counters.h" +#include "base/posix/eintr_wrapper.h" #include "base/string_util.h" #include "net/base/connection_type_histograms.h" #include "net/base/io_buffer.h" diff --git a/net/socket/tcp_server_socket_libevent.cc b/net/socket/tcp_server_socket_libevent.cc index 879ec8e..64f0096 100644 --- a/net/socket/tcp_server_socket_libevent.cc +++ b/net/socket/tcp_server_socket_libevent.cc @@ -15,7 +15,7 @@ #include <netinet/in.h> #endif -#include "base/eintr_wrapper.h" +#include "base/posix/eintr_wrapper.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/net/udp/udp_socket_libevent.cc b/net/udp/udp_socket_libevent.cc index a879ecb..d02d6f1 100644 --- a/net/udp/udp_socket_libevent.cc +++ b/net/udp/udp_socket_libevent.cc @@ -10,10 +10,10 @@ #include <sys/socket.h> #include "base/callback.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/stats_counters.h" +#include "base/posix/eintr_wrapper.h" #include "base/rand_util.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" diff --git a/net/udp/udp_socket_win.cc b/net/udp/udp_socket_win.cc index f1b7afa..0be64513 100644 --- a/net/udp/udp_socket_win.cc +++ b/net/udp/udp_socket_win.cc @@ -7,10 +7,10 @@ #include <mstcpip.h> #include "base/callback.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/stats_counters.h" +#include "base/posix/eintr_wrapper.h" #include "base/rand_util.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" diff --git a/ppapi/proxy/plugin_dispatcher.cc b/ppapi/proxy/plugin_dispatcher.cc index 37f1f1f..29bcb4a 100644 --- a/ppapi/proxy/plugin_dispatcher.cc +++ b/ppapi/proxy/plugin_dispatcher.cc @@ -32,7 +32,7 @@ #include "ppapi/shared_impl/resource.h" #if defined(OS_POSIX) && !defined(OS_NACL) -#include "base/eintr_wrapper.h" +#include "base/posix/eintr_wrapper.h" #include "ipc/ipc_channel_posix.h" #endif diff --git a/printing/pdf_metafile_skia.cc b/printing/pdf_metafile_skia.cc index 91843f8..3c78d7f 100644 --- a/printing/pdf_metafile_skia.cc +++ b/printing/pdf_metafile_skia.cc @@ -4,11 +4,11 @@ #include "printing/pdf_metafile_skia.h" -#include "base/eintr_wrapper.h" #include "base/file_descriptor_posix.h" #include "base/file_util.h" #include "base/hash_tables.h" #include "base/metrics/histogram.h" +#include "base/posix/eintr_wrapper.h" #include "skia/ext/vector_platform_device_skia.h" #include "third_party/skia/include/core/SkData.h" #include "third_party/skia/include/core/SkRefCnt.h" diff --git a/remoting/host/desktop_session_agent_posix.cc b/remoting/host/desktop_session_agent_posix.cc index c6dff86..445bc16 100644 --- a/remoting/host/desktop_session_agent_posix.cc +++ b/remoting/host/desktop_session_agent_posix.cc @@ -9,7 +9,7 @@ #include <sys/types.h> #include <unistd.h> -#include "base/eintr_wrapper.h" +#include "base/posix/eintr_wrapper.h" #include "base/single_thread_task_runner.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_channel_proxy.h" diff --git a/remoting/host/linux/audio_pipe_reader.cc b/remoting/host/linux/audio_pipe_reader.cc index 4bd3400..9b35f65 100644 --- a/remoting/host/linux/audio_pipe_reader.cc +++ b/remoting/host/linux/audio_pipe_reader.cc @@ -9,9 +9,9 @@ #include <sys/types.h> #include <unistd.h> -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/stl_util.h" namespace remoting { diff --git a/remoting/host/local_input_monitor_thread_linux.cc b/remoting/host/local_input_monitor_thread_linux.cc index 86932cc..a497252 100644 --- a/remoting/host/local_input_monitor_thread_linux.cc +++ b/remoting/host/local_input_monitor_thread_linux.cc @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "remoting/host/mouse_move_observer.h" #include "third_party/skia/include/core/SkPoint.h" diff --git a/remoting/host/mac/me2me_preference_pane.mm b/remoting/host/mac/me2me_preference_pane.mm index ad4ac3c..3d0879b 100644 --- a/remoting/host/mac/me2me_preference_pane.mm +++ b/remoting/host/mac/me2me_preference_pane.mm @@ -15,9 +15,9 @@ #include <fstream> -#include "base/eintr_wrapper.h" #include "base/mac/scoped_launch_data.h" #include "base/memory/scoped_ptr.h" +#include "base/posix/eintr_wrapper.h" #include "remoting/host/constants_mac.h" #include "remoting/host/host_config.h" #import "remoting/host/mac/me2me_preference_pane_confirm_pin.h" diff --git a/remoting/host/posix/signal_handler.cc b/remoting/host/posix/signal_handler.cc index 69a3cc0..6068287 100644 --- a/remoting/host/posix/signal_handler.cc +++ b/remoting/host/posix/signal_handler.cc @@ -13,9 +13,9 @@ #include <utility> #include "base/compiler_specific.h" -#include "base/eintr_wrapper.h" #include "base/message_loop.h" #include "base/message_pump_libevent.h" +#include "base/posix/eintr_wrapper.h" #include "base/threading/platform_thread.h" namespace remoting { diff --git a/rlz/lib/rlz_lib_test.cc b/rlz/lib/rlz_lib_test.cc index 3f5ca1f..338473b 100644 --- a/rlz/lib/rlz_lib_test.cc +++ b/rlz/lib/rlz_lib_test.cc @@ -13,7 +13,7 @@ // The "GGLA" brand is used to test the normal code flow of the code, and the // "TEST" brand is used to test the supplementary brand code code flow. -#include "base/eintr_wrapper.h" +#include "base/posix/eintr_wrapper.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/rlz/mac/lib/rlz_value_store_mac.mm b/rlz/mac/lib/rlz_value_store_mac.mm index 795a0cc..6148e54 100644 --- a/rlz/mac/lib/rlz_value_store_mac.mm +++ b/rlz/mac/lib/rlz_value_store_mac.mm @@ -4,10 +4,10 @@ #include "rlz/mac/lib/rlz_value_store_mac.h" -#include "base/eintr_wrapper.h" #include "base/mac/foundation_util.h" #include "base/file_path.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/sys_string_conversions.h" #include "rlz/lib/assert.h" #include "rlz/lib/lib_values.h" diff --git a/sandbox/linux/seccomp-bpf/sandbox_bpf.h b/sandbox/linux/seccomp-bpf/sandbox_bpf.h index a50ddb3..16ab1d3 100644 --- a/sandbox/linux/seccomp-bpf/sandbox_bpf.h +++ b/sandbox/linux/seccomp-bpf/sandbox_bpf.h @@ -42,8 +42,8 @@ #ifndef SECCOMP_BPF_STANDALONE #include "base/basictypes.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #endif #if defined(SECCOMP_BPF_VALGRIND_HACKS) diff --git a/sandbox/linux/services/libc_urandom_override.cc b/sandbox/linux/services/libc_urandom_override.cc index ee34045..3f99572 100644 --- a/sandbox/linux/services/libc_urandom_override.cc +++ b/sandbox/linux/services/libc_urandom_override.cc @@ -10,8 +10,8 @@ #include <sys/stat.h> #include <unistd.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/rand_util.h" // Note: this file is used by the zygote and nacl_helper. diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc index 45d700b..7a174ef 100644 --- a/sandbox/linux/suid/client/setuid_sandbox_client.cc +++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc @@ -6,10 +6,10 @@ #include <sys/wait.h> #include <unistd.h> -#include "base/eintr_wrapper.h" #include "base/environment.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/posix/eintr_wrapper.h" #include "base/string_number_conversions.h" #include "sandbox/linux/suid/common/sandbox.h" diff --git a/tools/android/common/adb_connection.cc b/tools/android/common/adb_connection.cc index 1556fb3..91c25fe 100644 --- a/tools/android/common/adb_connection.cc +++ b/tools/android/common/adb_connection.cc @@ -12,8 +12,8 @@ #include <sys/types.h> #include <unistd.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "tools/android/common/net.h" namespace tools { diff --git a/tools/android/common/daemon.cc b/tools/android/common/daemon.cc index 48e9cd6..9eafdbc 100644 --- a/tools/android/common/daemon.cc +++ b/tools/android/common/daemon.cc @@ -10,8 +10,8 @@ #include <unistd.h> #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" namespace { diff --git a/tools/android/fake_dns/fake_dns.cc b/tools/android/fake_dns/fake_dns.cc index e54ac2a..9a055bf 100644 --- a/tools/android/fake_dns/fake_dns.cc +++ b/tools/android/fake_dns/fake_dns.cc @@ -17,8 +17,8 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/safe_strerror_posix.h" #include "net/base/big_endian.h" #include "net/base/net_util.h" diff --git a/tools/android/forwarder/forwarder.cc b/tools/android/forwarder/forwarder.cc index 0197b29..e77c806 100644 --- a/tools/android/forwarder/forwarder.cc +++ b/tools/android/forwarder/forwarder.cc @@ -17,8 +17,8 @@ #include <unistd.h> #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "tools/android/common/adb_connection.h" #include "tools/android/common/daemon.h" #include "tools/android/common/net.h" diff --git a/tools/android/forwarder2/common.cc b/tools/android/forwarder2/common.cc index 6accd30..c97ed80 100644 --- a/tools/android/forwarder2/common.cc +++ b/tools/android/forwarder2/common.cc @@ -7,8 +7,8 @@ #include <errno.h> #include <unistd.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/safe_strerror_posix.h" namespace forwarder2 { diff --git a/tools/android/forwarder2/common.h b/tools/android/forwarder2/common.h index 3f546c6..43de57b 100644 --- a/tools/android/forwarder2/common.h +++ b/tools/android/forwarder2/common.h @@ -13,8 +13,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" // Preserving errno for Close() is important because the function is very often // used in cleanup code, after an error occurred, and it is very easy to pass an diff --git a/tools/android/forwarder2/daemon.cc b/tools/android/forwarder2/daemon.cc index c056460..2928f8f 100644 --- a/tools/android/forwarder2/daemon.cc +++ b/tools/android/forwarder2/daemon.cc @@ -17,10 +17,10 @@ #include <string> #include "base/basictypes.h" -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/safe_strerror_posix.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" diff --git a/tools/android/forwarder2/forwarder.cc b/tools/android/forwarder2/forwarder.cc index c4e645c..f1aef15 100644 --- a/tools/android/forwarder2/forwarder.cc +++ b/tools/android/forwarder2/forwarder.cc @@ -9,8 +9,8 @@ #include <stdlib.h> #include <string.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/safe_strerror_posix.h" #include "tools/android/forwarder2/socket.h" diff --git a/tools/android/forwarder2/host_forwarder_main.cc b/tools/android/forwarder2/host_forwarder_main.cc index dff0c8f..d7f52d1 100644 --- a/tools/android/forwarder2/host_forwarder_main.cc +++ b/tools/android/forwarder2/host_forwarder_main.cc @@ -12,11 +12,11 @@ #include <string> #include "base/command_line.h" -#include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_vector.h" +#include "base/posix/eintr_wrapper.h" #include "base/safe_strerror_posix.h" #include "base/string_number_conversions.h" #include "base/string_piece.h" diff --git a/tools/android/forwarder2/pipe_notifier.cc b/tools/android/forwarder2/pipe_notifier.cc index cf012b1..3aba18b 100644 --- a/tools/android/forwarder2/pipe_notifier.cc +++ b/tools/android/forwarder2/pipe_notifier.cc @@ -9,8 +9,8 @@ #include <sys/socket.h> #include <sys/types.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/safe_strerror_posix.h" namespace forwarder2 { diff --git a/tools/android/forwarder2/socket.cc b/tools/android/forwarder2/socket.cc index 397c096..4c3317b 100644 --- a/tools/android/forwarder2/socket.cc +++ b/tools/android/forwarder2/socket.cc @@ -13,8 +13,8 @@ #include <sys/socket.h> #include <sys/types.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/safe_strerror_posix.h" #include "tools/android/common/net.h" #include "tools/android/forwarder2/common.h" diff --git a/ui/surface/transport_dib_android.cc b/ui/surface/transport_dib_android.cc index bab725e..25a7875 100644 --- a/ui/surface/transport_dib_android.cc +++ b/ui/surface/transport_dib_android.cc @@ -7,9 +7,9 @@ #include <sys/stat.h> #include <unistd.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/posix/eintr_wrapper.h" #include "base/shared_memory.h" #include "skia/ext/platform_canvas.h" diff --git a/ui/surface/transport_dib_mac.cc b/ui/surface/transport_dib_mac.cc index a5e5d55..7abfbce 100644 --- a/ui/surface/transport_dib_mac.cc +++ b/ui/surface/transport_dib_mac.cc @@ -7,8 +7,8 @@ #include <sys/stat.h> #include <unistd.h> -#include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/posix/eintr_wrapper.h" #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" #include "skia/ext/platform_canvas.h" diff --git a/webkit/plugins/npapi/plugin_lib_posix.cc b/webkit/plugins/npapi/plugin_lib_posix.cc index b00f77e..cc3ed52 100644 --- a/webkit/plugins/npapi/plugin_lib_posix.cc +++ b/webkit/plugins/npapi/plugin_lib_posix.cc @@ -15,8 +15,8 @@ #include <sys/types.h> #include <unistd.h> -#include "base/eintr_wrapper.h" #include "base/file_util.h" +#include "base/posix/eintr_wrapper.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" |