commit 13e514de7abf84879f6ed5234c096cdbe88debf5
author morrita <morrita@chromium.org> Tue Oct 21 08:53:25 2014 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 17:47:47 2020 +0900
tree d78144d5a8dbb101b37c2e85a309d78d688c40e6
parent 3515bc2fbfb89142569a2c155a8333a69f2626aa

Refactoring: Make IPC::Channel::TakeClientFileDescriptor() a ScopedFD.

By using base::ScopedFD, the ownership of the returned FD becomes
clearer.

BUG=415294
R=brettw@chromium.org, jam@chromium.org, yzshen@chromium.org, sehr@chromium.org
TBR=gene@chromium.org

Review URL: https://codereview.chromium.org/621613002

Cr-Commit-Position: refs/heads/master@{#300381}


CrOS-Libchrome-Original-Commit: a409ccc3182ae1cb91fe7937a6c60f8d80755436

ipc/ipc_channel_posix_unittest.cc

diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc
index b61b345..d5346b9 100644
--- a/ipc/ipc_channel_posix_unittest.cc
+++ b/ipc/ipc_channel_posix_unittest.cc
@@ -246,9 +246,8 @@
   IPC::ChannelHandle in_handle("IN");
   scoped_ptr<IPC::ChannelPosix> in_chan(new IPC::ChannelPosix(
       in_handle, IPC::Channel::MODE_SERVER, &in_listener));
-  base::FileDescriptor out_fd(
-      in_chan->TakeClientFileDescriptor(), false);
-  IPC::ChannelHandle out_handle("OUT", out_fd);
+  IPC::ChannelHandle out_handle(
+      "OUT", base::FileDescriptor(in_chan->TakeClientFileDescriptor()));
   scoped_ptr<IPC::ChannelPosix> out_chan(new IPC::ChannelPosix(
       out_handle, IPC::Channel::MODE_CLIENT, &out_listener));
   ASSERT_TRUE(in_chan->Connect());
@@ -272,9 +271,8 @@
   IPC::ChannelHandle in_handle("IN");
   scoped_ptr<IPC::ChannelPosix> in_chan(new IPC::ChannelPosix(
       in_handle, IPC::Channel::MODE_SERVER, &in_listener));
-  base::FileDescriptor out_fd(
-      in_chan->TakeClientFileDescriptor(), false);
-  IPC::ChannelHandle out_handle("OUT", out_fd);
+  IPC::ChannelHandle out_handle(
+      "OUT", base::FileDescriptor(in_chan->TakeClientFileDescriptor()));
   scoped_ptr<IPC::ChannelPosix> out_chan(new IPC::ChannelPosix(
       out_handle, IPC::Channel::MODE_CLIENT, &out_listener));
   ASSERT_TRUE(in_chan->Connect());