Move eintr_wrapper.h from base to base/posix
Review URL: https://codereview.chromium.org/11366229
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167739 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 2025d00c3fa5270a0ea10c9ec7a18cfa69007beb
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 @@
#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/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
similarity index 85%
rename from base/eintr_wrapper.h
rename to 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_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/dbus/message_unittest.cc b/dbus/message_unittest.cc
index c61f170..7e4455a 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 fdb00f5..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 @@
#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"