Revert of Remove deprecated methods from Pickle. (patchset #10 id:180001 of https://codereview.chromium.org/818833004/)

Reason for revert:
Allegedly causes a performance hit: http://crbug.com/445173

Original issue's description:
> Remove deprecated methods from Pickle.
>
> BUG=444578
> TEST=none
> R=nasko@chromium.org
> TBR=ben@chromium.org
>
> Committed: https://chromium.googlesource.com/chromium/src/+/b740bfe23ae7ad244356a4a7538b95ae560251db

TBR=nasko@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=444578

Review URL: https://codereview.chromium.org/825353003

Cr-Commit-Position: refs/heads/master@{#309689}

2 files changed, 14 insertions, 13 deletions

diff --git a/components/bookmarks/browser/bookmark_node_data.cc b/components/bookmarks/browser/bookmark_node_data.cc
index 5f134ee..2d6e064 100644
--- a/components/bookmarks/browser/bookmark_node_data.cc
+++ b/components/bookmarks/browser/bookmark_node_data.cc
@@ -57,12 +57,13 @@ void BookmarkNodeData::Element::WriteToPickle(Pickle* pickle) const {
   }
 }
 
-bool BookmarkNodeData::Element::ReadFromPickle(PickleIterator* iterator) {
+bool BookmarkNodeData::Element::ReadFromPickle(Pickle* pickle,
+                                               PickleIterator* iterator) {
   std::string url_spec;
-  if (!iterator->ReadBool(&is_url) ||
-      !iterator->ReadString(&url_spec) ||
-      !iterator->ReadString16(&title) ||
-      !iterator->ReadInt64(&id_)) {
+  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);
@@ -70,13 +71,13 @@ bool BookmarkNodeData::Element::ReadFromPickle(PickleIterator* iterator) {
   date_folder_modified = base::Time();
   meta_info_map.clear();
   size_t meta_field_count;
-  if (!iterator->ReadSizeT(&meta_field_count))
+  if (!pickle->ReadSizeT(iterator, &meta_field_count))
     return false;
   for (size_t i = 0; i < meta_field_count; ++i) {
     std::string key;
     std::string value;
-    if (!iterator->ReadString(&key) ||
-        !iterator->ReadString(&value)) {
+    if (!pickle->ReadString(iterator, &key) ||
+        !pickle->ReadString(iterator, &value)) {
       return false;
     }
     meta_info_map[key] = value;
@@ -84,12 +85,12 @@ bool BookmarkNodeData::Element::ReadFromPickle(PickleIterator* iterator) {
   children.clear();
   if (!is_url) {
     size_t children_count;
-    if (!iterator->ReadSizeT(&children_count))
+    if (!pickle->ReadSizeT(iterator, &children_count))
       return false;
     children.reserve(children_count);
     for (size_t i = 0; i < children_count; ++i) {
       children.push_back(Element());
-      if (!children.back().ReadFromPickle(iterator))
+      if (!children.back().ReadFromPickle(pickle, iterator))
         return false;
     }
   }
@@ -244,11 +245,11 @@ bool BookmarkNodeData::ReadFromPickle(Pickle* pickle) {
   PickleIterator data_iterator(*pickle);
   size_t element_count;
   if (profile_path_.ReadFromPickle(&data_iterator) &&
-      data_iterator.ReadSizeT(&element_count)) {
+      pickle->ReadSizeT(&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(&data_iterator)) {
+      if (!tmp_elements[i].ReadFromPickle(pickle, &data_iterator)) {
         return false;
       }
     }
diff --git a/components/bookmarks/browser/bookmark_node_data.h b/components/bookmarks/browser/bookmark_node_data.h
index 47e85f6..c44594e1 100644
--- a/components/bookmarks/browser/bookmark_node_data.h
+++ b/components/bookmarks/browser/bookmark_node_data.h
@@ -77,7 +77,7 @@ struct BookmarkNodeData {
 
     // For reading/writing this Element.
     void WriteToPickle(Pickle* pickle) const;
-    bool ReadFromPickle(PickleIterator* iterator);
+    bool ReadFromPickle(Pickle* pickle, PickleIterator* iterator);
 
     // ID of the node.
     int64 id_;