summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_channel_factory.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-14 05:20:52 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-14 05:20:52 +0000
commitd9851bd77eb86992f3a0f37e8de3ad39c0234e21 (patch)
tree3ebf07da9aee8259fbb8c4f625613e2903b162b2 /ipc/ipc_channel_factory.cc
parent826252a5e0305fa09ed3730f448be3faf34aaeb3 (diff)
downloadchromium_src-d9851bd77eb86992f3a0f37e8de3ad39c0234e21.zip
chromium_src-d9851bd77eb86992f3a0f37e8de3ad39c0234e21.tar.gz
chromium_src-d9851bd77eb86992f3a0f37e8de3ad39c0234e21.tar.bz2
Implement ScopedFD in terms of ScopedGeneric.
Move to a new file base/files/scoped_file.h. I will also add ScopedFILE to here (currently in file_util.h) later. I think there is a crash in the old code in content/browser/zygote_host/zygote_host_impl_linux.cc that this patch should fix. The old ScopedFD took the address of something in a vector that is being modified. I removed SafeScopedFD from content/common/sandbox_linux/sandbox_linux.cc since base's ScopedFD not CHECKs on close failure (this is a more recent addition). BUG= R=agl@chromium.org, viettrungluu@chromium.org Review URL: https://codereview.chromium.org/191673003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257001 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel_factory.cc')
-rw-r--r--ipc/ipc_channel_factory.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/ipc/ipc_channel_factory.cc b/ipc/ipc_channel_factory.cc
index 5c24284..22e4946 100644
--- a/ipc/ipc_channel_factory.cc
+++ b/ipc/ipc_channel_factory.cc
@@ -5,6 +5,7 @@
#include "ipc/ipc_channel_factory.h"
#include "base/file_util.h"
+#include "base/files/scoped_file.h"
#include "base/logging.h"
#include "ipc/unix_domain_socket_util.h"
@@ -58,14 +59,14 @@ void ChannelFactory::OnFileCanReadWithoutBlocking(int fd) {
return;
}
- file_util::ScopedFD scoped_fd(&new_fd);
+ base::ScopedFD scoped_fd(new_fd);
// Verify that the IPC channel peer is running as the same user.
if (!IsPeerAuthorized(new_fd))
return;
ChannelHandle handle(std::string(),
- base::FileDescriptor(*scoped_fd.release(), true));
+ base::FileDescriptor(scoped_fd.release(), true));
delegate_->OnClientConnected(handle);
}