Revert of Remove deprecated methods from Pickle.

skia/ext/skia_utils_base.cc

Index: skia/ext/skia_utils_base.cc
diff --git a/skia/ext/skia_utils_base.cc b/skia/ext/skia_utils_base.cc
index 56ca993081059438c22bd24bddf775b720f2e8ff..07c06bb60d9384c05805ecfc7374305b6a221e1f 100644
--- a/skia/ext/skia_utils_base.cc
+++ b/skia/ext/skia_utils_base.cc
@@ -6,11 +6,11 @@
 
 namespace skia {
 
-bool ReadSkString(PickleIterator* iter, SkString* str) {
-  int reply_length;
+bool ReadSkString(const Pickle& pickle, PickleIterator* iter, SkString* str) {
+  int         reply_length;
   const char* reply_text;
 
-  if (!iter->ReadData(&reply_text, &reply_length))
+  if (!pickle.ReadData(iter, &reply_text, &reply_length))
     return false;
 
   if (str)
@@ -18,16 +18,16 @@
   return true;
 }
 
-bool ReadSkFontIdentity(PickleIterator* iter,
+bool ReadSkFontIdentity(const Pickle& pickle, PickleIterator* iter,
                         SkFontConfigInterface::FontIdentity* identity) {
-  uint32_t reply_id;
-  uint32_t reply_ttcIndex;
-  int reply_length;
+  uint32_t    reply_id;
+  uint32_t    reply_ttcIndex;
+  int         reply_length;
   const char* reply_text;
 
-  if (!iter->ReadUInt32(&reply_id) ||
-      !iter->ReadUInt32(&reply_ttcIndex) ||
-      !iter->ReadData(&reply_text, &reply_length))
+  if (!pickle.ReadUInt32(iter, &reply_id) ||
+      !pickle.ReadUInt32(iter, &reply_ttcIndex) ||
+      !pickle.ReadData(iter, &reply_text, &reply_length))
     return false;
 
   if (identity) {