Index: chrome/browser/bookmarks/bookmark_node_data.cc |
diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc |
index 7d1d72f9012186bf742f16233108b543e798a114..14c77d301c5030abb596d5baa4127640690b8b4b 100644 |
--- a/chrome/browser/bookmarks/bookmark_node_data.cc |
+++ b/chrome/browser/bookmarks/bookmark_node_data.cc |
@@ -55,7 +55,7 @@ void BookmarkNodeData::Element::WriteToPickle(Pickle* pickle) const { |
} |
bool BookmarkNodeData::Element::ReadFromPickle(Pickle* pickle, |
- void** iterator) { |
+ PickleIterator* iterator) { |
std::string url_spec; |
if (!pickle->ReadBool(iterator, &is_url) || |
!pickle->ReadString(iterator, &url_spec) || |
@@ -294,9 +294,9 @@ void BookmarkNodeData::WriteToPickle(Profile* profile, Pickle* pickle) const { |
} |
bool BookmarkNodeData::ReadFromPickle(Pickle* pickle) { |
- void* data_iterator = NULL; |
+ PickleIterator data_iterator(*pickle); |
size_t element_count; |
- if (profile_path_.ReadFromPickle(pickle, &data_iterator) && |
+ if (profile_path_.ReadFromPickle(&data_iterator) && |
pickle->ReadSize(&data_iterator, &element_count)) { |
std::vector<Element> tmp_elements; |
tmp_elements.resize(element_count); |