| Index: chrome/renderer/extensions/user_script_slave.cc
 | 
| diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc
 | 
| index c0641975fd56e4381b11809e125b828a0cb52ceb..6aa71718dcec9987ba2f40145baf3ee38c7224fe 100644
 | 
| --- a/chrome/renderer/extensions/user_script_slave.cc
 | 
| +++ b/chrome/renderer/extensions/user_script_slave.cc
 | 
| @@ -155,10 +155,10 @@ bool UserScriptSlave::UpdateScripts(base::SharedMemoryHandle shared_memory) {
 | 
|      return false;
 | 
|  
 | 
|    // Unpickle scripts.
 | 
| -  void* iter = NULL;
 | 
|    size_t num_scripts = 0;
 | 
|    Pickle pickle(reinterpret_cast<char*>(shared_memory_->memory()),
 | 
|                  pickle_size);
 | 
| +  PickleIterator iter(pickle);
 | 
|    pickle.ReadSize(&iter, &num_scripts);
 | 
|  
 | 
|    scripts_.reserve(num_scripts);
 | 
| 
 |