Refactor Pickle Read methods to use higher performance PickleIterator.

chrome/common/extensions/user_script.h

Index: chrome/common/extensions/user_script.h
diff --git a/chrome/common/extensions/user_script.h b/chrome/common/extensions/user_script.h
index 53147fc2823a18f64de8afa6a4abdeccebf2a066..1f8bc6712a7114afb697056b3db3bcbad2d24b47 100644
--- a/chrome/common/extensions/user_script.h
+++ b/chrome/common/extensions/user_script.h
@@ -82,7 +82,7 @@ class UserScript {
     // Serialization support. The content and FilePath members will not be
     // serialized!
     void Pickle(::Pickle* pickle) const;
-    void Unpickle(const ::Pickle& pickle, void** iter);
+    void Unpickle(const ::Pickle& pickle, PickleReader* iter);
 
    private:
     // Where the script file lives on the disk. We keep the path split so that
@@ -187,7 +187,7 @@ class UserScript {
   // Deserialize the script from a pickle. Note that this always succeeds
   // because presumably we were the one that pickled it, and we did it
   // correctly.
-  void Unpickle(const ::Pickle& pickle, void** iter);
+  void Unpickle(const ::Pickle& pickle, PickleReader* iter);
 
  private:
   // Pickle helper functions used to pickle the individual types of components.
@@ -198,11 +198,11 @@ class UserScript {
   void PickleScripts(::Pickle* pickle, const FileList& scripts) const;
 
   // Unpickle helper functions used to unpickle individual types of components.
-  void UnpickleGlobs(const ::Pickle& pickle, void** iter,
+  void UnpickleGlobs(const ::Pickle& pickle, PickleReader* iter,
                      std::vector<std::string>* globs);
-  void UnpickleURLPatternSet(const ::Pickle& pickle, void** iter,
+  void UnpickleURLPatternSet(const ::Pickle& pickle, PickleReader* iter,
                              URLPatternSet* pattern_list);
-  void UnpickleScripts(const ::Pickle& pickle, void** iter,
+  void UnpickleScripts(const ::Pickle& pickle, PickleReader* iter,
                        FileList* scripts);
 
   // The location to run the script inside the document.