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

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

Issue 1154283003: Change most uses of Pickle to base::Pickle (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 | « components/nacl/loader/nacl_helper_linux.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_ipc_adapter.cc
diff --git a/components/nacl/loader/nacl_ipc_adapter.cc b/components/nacl/loader/nacl_ipc_adapter.cc
index 8e402e11a00cd263e1aa32bceeb0c39810cbd4f7..a9ea0b8d8d2976bde12c90c8f0773988e2493924 100644
--- a/components/nacl/loader/nacl_ipc_adapter.cc
+++ b/components/nacl/loader/nacl_ipc_adapter.cc
@@ -485,7 +485,7 @@ bool NaClIPCAdapter::OnMessageReceived(const IPC::Message& msg) {
// Handle PpapiHostMsg_OpenResource outside the lock as it requires sending
// IPC to handle properly.
if (type == PpapiHostMsg_OpenResource::ID) {
- PickleIterator iter = IPC::SyncMessage::GetDataIterator(&msg);
+ base::PickleIterator iter = IPC::SyncMessage::GetDataIterator(&msg);
ppapi::proxy::SerializedHandle sh;
uint64_t token_lo;
uint64_t token_hi;
@@ -639,7 +639,7 @@ void NaClIPCAdapter::SaveOpenResourceMessage(
// The file token didn't resolve successfully, so we give the
// original FD to the client without making a validated NaClDesc.
// However, we must rewrite the message to clear the file tokens.
- PickleIterator iter = IPC::SyncMessage::GetDataIterator(&orig_msg);
+ base::PickleIterator iter = IPC::SyncMessage::GetDataIterator(&orig_msg);
ppapi::proxy::SerializedHandle sh;
// We know that this can be read safely; see the original read in
« no previous file with comments | « components/nacl/loader/nacl_helper_linux.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