Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1207)

Unified Diff: ipc/ipc_channel_factory.cc

Issue 191673003: Implement ScopedFD in terms of ScopedGeneric. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ipc/ipc_channel_factory.cc
diff --git a/ipc/ipc_channel_factory.cc b/ipc/ipc_channel_factory.cc
index 5c24284f95dd3e64010cacbd9774e0d2707aa131..22e49464c4342b1ac33cd92c8b14b79079a974b9 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);
}

Powered by Google App Engine
This is Rietveld 408576698