Refactor Pickle Read methods to use higher performance PickleIterator.

chrome/common/extensions/user_script.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_COMMON_EXTENSIONS_USER_SCRIPT_H_
 #define CHROME_COMMON_EXTENSIONS_USER_SCRIPT_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/string_piece.h"
 #include "googleurl/src/gurl.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/extensions/url_pattern_set.h"
 
 class Pickle;
+class PickleIterator;
 
 // Represents a user script, either a standalone one, or one that is part of an
 // extension.
 class UserScript {
  public:
   // The file extension for standalone user scripts.
   static const char kFileExtension[];
 
   // The bitmask for valid user script injectable schemes used by URLPattern.
   enum {
@@ skipping 46 matching lines @@
     void set_external_content(const base::StringPiece& content) {
       external_content_ = content;
     }
     void set_content(const base::StringPiece& content) {
       content_.assign(content.begin(), content.end());
     }
 
     // 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, PickleIterator* iter);
 
    private:
     // Where the script file lives on the disk. We keep the path split so that
     // it can be localized at will.
     FilePath extension_root_;
     FilePath relative_path_;
 
     // The url to this scipt file.
     GURL url_;
 
@@ skipping 84 matching lines @@
   // otherwise.
   bool MatchesURL(const GURL& url) const;
 
   // Serialize the UserScript into a pickle. The content of the scripts and
   // paths to UserScript::Files will not be serialized!
   void Pickle(::Pickle* pickle) const;
 
   // 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, PickleIterator* iter);
 
  private:
   // Pickle helper functions used to pickle the individual types of components.
   void PickleGlobs(::Pickle* pickle,
                    const std::vector<std::string>& globs) const;
   void PickleURLPatternSet(::Pickle* pickle,
                            const URLPatternSet& pattern_list) const;
   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, PickleIterator* iter,
                      std::vector<std::string>* globs);
-  void UnpickleURLPatternSet(const ::Pickle& pickle, void** iter,
+  void UnpickleURLPatternSet(const ::Pickle& pickle, PickleIterator* iter,
                              URLPatternSet* pattern_list);
-  void UnpickleScripts(const ::Pickle& pickle, void** iter,
+  void UnpickleScripts(const ::Pickle& pickle, PickleIterator* iter,
                        FileList* scripts);
 
   // The location to run the script inside the document.
   RunLocation run_location_;
 
   // The namespace of the script. This is used by Greasemonkey in the same way
   // as XML namespaces. Only used when parsing Greasemonkey-style scripts.
   std::string name_space_;
 
   // The script's name. Only used when parsing Greasemonkey-style scripts.
@@ skipping 34 matching lines @@
   // Defaults to false.
   bool match_all_frames_;
 
   // True if the script should be injected into an incognito tab.
   bool incognito_enabled_;
 };
 
 typedef std::vector<UserScript> UserScriptList;
 
 #endif  // CHROME_COMMON_EXTENSIONS_USER_SCRIPT_H_