Refactor Pickle Read methods to use higher performance PickleIterator.

chrome/browser/bookmarks/bookmark_node_data.cc

 // 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.
 
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/pickle.h"
@@ skipping 37 matching lines @@
   if (!is_url) {
     pickle->WriteSize(children.size());
     for (std::vector<Element>::const_iterator i = children.begin();
          i != children.end(); ++i) {
       i->WriteToPickle(pickle);
     }
   }
 }
 
 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) ||
       !pickle->ReadString16(iterator, &title) ||
       !pickle->ReadInt64(iterator, &id_)) {
     return false;
   }
   url = GURL(url_spec);
   children.clear();
   if (!is_url) {
@@ skipping 218 matching lines @@
 void BookmarkNodeData::WriteToPickle(Profile* profile, Pickle* pickle) const {
   FilePath path = profile ? profile->GetPath() : FilePath();
   path.WriteToPickle(pickle);
   pickle->WriteSize(elements.size());
 
   for (size_t i = 0; i < elements.size(); ++i)
     elements[i].WriteToPickle(pickle);
 }
 
 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);
     for (size_t i = 0; i < element_count; ++i) {
       if (!tmp_elements[i].ReadFromPickle(pickle, &data_iterator)) {
         return false;
       }
     }
     elements.swap(tmp_elements);
   }
@@ skipping 34 matching lines @@
   DCHECK(profile_path_.empty());
 
   if (profile)
     profile_path_ = profile->GetPath();
 }
 
 bool BookmarkNodeData::IsFromProfile(Profile* profile) const {
   // An empty path means the data is not associated with any profile.
   return !profile_path_.empty() && profile_path_ == profile->GetPath();
 }