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

Unified Diff: extensions/renderer/user_script_set.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 | « extensions/common/user_script_unittest.cc ('k') | gpu/ipc/gpu_command_buffer_traits.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/user_script_set.cc
diff --git a/extensions/renderer/user_script_set.cc b/extensions/renderer/user_script_set.cc
index 01e8a5a2e682887f24c136dc1fedaa99f7b6fc05..6af862703354a6b58330a992c1463852f073ccd6 100644
--- a/extensions/renderer/user_script_set.cc
+++ b/extensions/renderer/user_script_set.cc
@@ -98,21 +98,22 @@ bool UserScriptSet::UpdateUserScripts(base::SharedMemoryHandle shared_memory,
return false;
// First get the size of the memory block.
- if (!shared_memory_->Map(sizeof(Pickle::Header)))
+ if (!shared_memory_->Map(sizeof(base::Pickle::Header)))
return false;
- Pickle::Header* pickle_header =
- reinterpret_cast<Pickle::Header*>(shared_memory_->memory());
+ base::Pickle::Header* pickle_header =
+ reinterpret_cast<base::Pickle::Header*>(shared_memory_->memory());
// Now map in the rest of the block.
- int pickle_size = sizeof(Pickle::Header) + pickle_header->payload_size;
+ int pickle_size = sizeof(base::Pickle::Header) + pickle_header->payload_size;
shared_memory_->Unmap();
if (!shared_memory_->Map(pickle_size))
return false;
// Unpickle scripts.
size_t num_scripts = 0;
- Pickle pickle(reinterpret_cast<char*>(shared_memory_->memory()), pickle_size);
- PickleIterator iter(pickle);
+ base::Pickle pickle(reinterpret_cast<char*>(shared_memory_->memory()),
+ pickle_size);
+ base::PickleIterator iter(pickle);
CHECK(iter.ReadSizeT(&num_scripts));
scripts_.clear();
« no previous file with comments | « extensions/common/user_script_unittest.cc ('k') | gpu/ipc/gpu_command_buffer_traits.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698