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

Unified Diff: components/nacl/loader/nacl_helper_linux.cc

Issue 1146813011: Move UnixDomainSocket to base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « base/posix/unix_domain_socket_linux_unittest.cc ('k') | components/nacl/zygote/nacl_fork_delegate_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/loader/nacl_helper_linux.cc
diff --git a/components/nacl/loader/nacl_helper_linux.cc b/components/nacl/loader/nacl_helper_linux.cc
index 8206eca99b49f6776a528c34e6f68fde83f544bf..ac7648f5e40ae50a16fbf2decf6432a164cfd186 100644
--- a/components/nacl/loader/nacl_helper_linux.cc
+++ b/components/nacl/loader/nacl_helper_linux.cc
@@ -276,8 +276,8 @@ bool HonorRequestAndReply(int reply_fd,
if (!have_to_reply)
return false;
const std::vector<int> empty; // We never send file descriptors back.
- if (!UnixDomainSocket::SendMsg(reply_fd, write_pickle.data(),
- write_pickle.size(), empty)) {
+ if (!base::UnixDomainSocket::SendMsg(reply_fd, write_pickle.data(),
+ write_pickle.size(), empty)) {
LOG(ERROR) << "*** send() to zygote failed";
return false;
}
@@ -291,7 +291,7 @@ bool HandleZygoteRequest(int zygote_ipc_fd,
nacl::NaClSandbox* nacl_sandbox) {
ScopedVector<base::ScopedFD> fds;
char buf[kNaClMaxIPCMessageLength];
- const ssize_t msglen = UnixDomainSocket::RecvMsg(zygote_ipc_fd,
+ const ssize_t msglen = base::UnixDomainSocket::RecvMsg(zygote_ipc_fd,
&buf, sizeof(buf), &fds);
// If the Zygote has started handling requests, we should be sandboxed via
// the setuid sandbox.
@@ -468,9 +468,9 @@ int main(int argc, char* argv[]) {
const std::vector<int> empty;
// Send the zygote a message to let it know we are ready to help
- if (!UnixDomainSocket::SendMsg(kNaClZygoteDescriptor,
- kNaClHelperStartupAck,
- sizeof(kNaClHelperStartupAck), empty)) {
+ if (!base::UnixDomainSocket::SendMsg(kNaClZygoteDescriptor,
+ kNaClHelperStartupAck,
+ sizeof(kNaClHelperStartupAck), empty)) {
LOG(ERROR) << "*** send() to zygote failed";
}
« no previous file with comments | « base/posix/unix_domain_socket_linux_unittest.cc ('k') | components/nacl/zygote/nacl_fork_delegate_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698