Refactor Pickle Read methods to use higher performance PickleIterator.

chrome/browser/bookmarks/bookmark_node_data.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_BROWSER_BOOKMARKS_BOOKMARK_NODE_DATA_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_NODE_DATA_H_
 #pragma once
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "ui/base/dragdrop/os_exchange_data.h"
 #endif
 
 class BookmarkNode;
 class Pickle;
+class PickleIterator;
 class Profile;
 
 // BookmarkNodeData is used to represent the following:
 //
 // . A single URL.
 // . A single node from the bookmark model.
 // . A set of nodes from the bookmark model.
 //
 // BookmarkNodeData is used by bookmark related views to represent a dragged
 // bookmark or bookmarks.
@@ skipping 26 matching lines @@
     // Children, only used for non-URL nodes.
     std::vector<Element> children;
 
     int64 id() { return id_; }
 
    private:
     friend struct BookmarkNodeData;
 
     // For reading/writing this Element.
     void WriteToPickle(Pickle* pickle) const;
-    bool ReadFromPickle(Pickle* pickle, void** iterator);
+    bool ReadFromPickle(Pickle* pickle, PickleIterator* iterator);
 
     // ID of the node.
     int64 id_;
   };
 
   BookmarkNodeData();
 
 #if defined(TOOLKIT_VIEWS)
   static ui::OSExchangeData::CustomFormat GetBookmarkCustomFormat();
 #endif
@@ skipping 78 matching lines @@
   static const char* kClipboardFormatString;
 
   static bool ClipboardContainsBookmarks();
 
  private:
   // Path of the profile we originated from.
   FilePath profile_path_;
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_NODE_DATA_H_