Revert of Remove deprecated methods from Pickle.

skia/ext/skia_utils_base.h

Index: skia/ext/skia_utils_base.h
diff --git a/skia/ext/skia_utils_base.h b/skia/ext/skia_utils_base.h
index 01cf8edd11f0af7eef981e7b6003f1f3c7aa96f5..cfddd31b6f66bcc6e8f4662e60ac713657ec78dc 100644
--- a/skia/ext/skia_utils_base.h
+++ b/skia/ext/skia_utils_base.h
@@ -12,20 +12,20 @@
 
 // Return true if the pickle/iterator contains a string. If so, and if str
 // is not null, copy that string into str.
-SK_API bool ReadSkString(PickleIterator* iter, SkString* str);
+SK_API bool ReadSkString(const Pickle& pickle, PickleIterator* iter,
+                         SkString* str);
 
 // Return true if the pickle/iterator contains a FontIdentity. If so, and if
 // identity is not null, copy it into identity.
-SK_API bool ReadSkFontIdentity(PickleIterator* iter,
+SK_API bool ReadSkFontIdentity(const Pickle& pickle, PickleIterator* iter,
                                SkFontConfigInterface::FontIdentity* identity);
 
 // Return true if str can be written into the request pickle.
 SK_API bool WriteSkString(Pickle* pickle, const SkString& str);
 
 // Return true if identity can be written into the request pickle.
-SK_API bool WriteSkFontIdentity(
-    Pickle* pickle,
-    const SkFontConfigInterface::FontIdentity& identity);
+SK_API bool WriteSkFontIdentity(Pickle* pickle,
+                          const SkFontConfigInterface::FontIdentity& identity);
 
 }  // namespace skia