| Index: base/posix/unix_domain_socket_linux_unittest.cc
|
| diff --git a/base/posix/unix_domain_socket_linux_unittest.cc b/base/posix/unix_domain_socket_linux_unittest.cc
|
| index 22bb172ad5b1b912460b613382018db9be22af68..bb7154fe5e971d568fbaacaf86a2bbee1bd0921a 100644
|
| --- a/base/posix/unix_domain_socket_linux_unittest.cc
|
| +++ b/base/posix/unix_domain_socket_linux_unittest.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/file_util.h"
|
| +#include "base/files/scoped_file.h"
|
| #include "base/pickle.h"
|
| #include "base/posix/unix_domain_socket_linux.h"
|
| #include "base/synchronization/waitable_event.h"
|
| @@ -25,8 +26,8 @@ TEST(UnixDomainSocketTest, SendRecvMsgAbortOnReplyFDClose) {
|
|
|
| int fds[2];
|
| ASSERT_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds));
|
| - file_util::ScopedFD scoped_fd0(&fds[0]);
|
| - file_util::ScopedFD scoped_fd1(&fds[1]);
|
| + ScopedFD scoped_fd0(fds[0]);
|
| + ScopedFD scoped_fd1(fds[1]);
|
|
|
| // Have the thread send a synchronous message via the socket.
|
| Pickle request;
|
| @@ -62,7 +63,7 @@ TEST(UnixDomainSocketTest, SendRecvMsgAvoidsSIGPIPE) {
|
| ASSERT_EQ(0, sigaction(SIGPIPE, &act, &oldact));
|
| int fds[2];
|
| ASSERT_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds));
|
| - file_util::ScopedFD scoped_fd1(&fds[1]);
|
| + ScopedFD scoped_fd1(fds[1]);
|
| ASSERT_EQ(0, IGNORE_EINTR(close(fds[0])));
|
|
|
| // Have the thread send a synchronous message via the socket. Unless the
|
|
|