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

Unified Diff: sandbox/linux/syscall_broker/broker_client.cc

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 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: sandbox/linux/syscall_broker/broker_client.cc
diff --git a/sandbox/linux/syscall_broker/broker_client.cc b/sandbox/linux/syscall_broker/broker_client.cc
index 8d04197160a9accdb67c84f2f132811ace873d17..760cf59b3c14340ff1c09ec4cd62e0f3dee6eaa3 100644
--- a/sandbox/linux/syscall_broker/broker_client.cc
+++ b/sandbox/linux/syscall_broker/broker_client.cc
@@ -65,7 +65,7 @@ int BrokerClient::PathAndFlagsSyscall(IPCCommand syscall_type,
}
}
- Pickle write_pickle;
+ base::Pickle write_pickle;
write_pickle.WriteInt(syscall_type);
write_pickle.WriteString(pathname);
write_pickle.WriteInt(flags);
@@ -78,7 +78,7 @@ int BrokerClient::PathAndFlagsSyscall(IPCCommand syscall_type,
// temporary socketpair (created internally by SendRecvMsg()).
// Then read the reply on this new socketpair in reply_buf and put an
// eventual attached file descriptor in |returned_fd|.
- ssize_t msg_len = UnixDomainSocket::SendRecvMsgWithFlags(
+ ssize_t msg_len = base::UnixDomainSocket::SendRecvMsgWithFlags(
ipc_channel_.get(), reply_buf, sizeof(reply_buf), recvmsg_flags,
&returned_fd, write_pickle);
if (msg_len <= 0) {
@@ -87,8 +87,8 @@ int BrokerClient::PathAndFlagsSyscall(IPCCommand syscall_type,
return -ENOMEM;
}
- Pickle read_pickle(reinterpret_cast<char*>(reply_buf), msg_len);
- PickleIterator iter(read_pickle);
+ base::Pickle read_pickle(reinterpret_cast<char*>(reply_buf), msg_len);
+ base::PickleIterator iter(read_pickle);
int return_value = -1;
// Now deserialize the return value and eventually return the file
// descriptor.

Powered by Google App Engine
This is Rietveld 408576698