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

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

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

2 files changed, 15 insertions, 15 deletions

diff --git a/skia/ext/skia_utils_base.cc b/skia/ext/skia_utils_base.cc
index 07c06bb..56ca993 100644
--- a/skia/ext/skia_utils_base.cc
+++ b/skia/ext/skia_utils_base.cc
@@ -6,11 +6,11 @@
 
 namespace skia {
 
-bool ReadSkString(const Pickle& pickle, PickleIterator* iter, SkString* str) {
-  int         reply_length;
+bool ReadSkString(PickleIterator* iter, SkString* str) {
+  int reply_length;
   const char* reply_text;
 
-  if (!pickle.ReadData(iter, &reply_text, &reply_length))
+  if (!iter->ReadData(&reply_text, &reply_length))
     return false;
 
   if (str)
@@ -18,16 +18,16 @@ bool ReadSkString(const Pickle& pickle, PickleIterator* iter, SkString* str) {
   return true;
 }
 
-bool ReadSkFontIdentity(const Pickle& pickle, PickleIterator* iter,
+bool ReadSkFontIdentity(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 (!pickle.ReadUInt32(iter, &reply_id) ||
-      !pickle.ReadUInt32(iter, &reply_ttcIndex) ||
-      !pickle.ReadData(iter, &reply_text, &reply_length))
+  if (!iter->ReadUInt32(&reply_id) ||
+      !iter->ReadUInt32(&reply_ttcIndex) ||
+      !iter->ReadData(&reply_text, &reply_length))
     return false;
 
   if (identity) {
diff --git a/skia/ext/skia_utils_base.h b/skia/ext/skia_utils_base.h
index cfddd31..01cf8ed 100644
--- a/skia/ext/skia_utils_base.h
+++ b/skia/ext/skia_utils_base.h
@@ -12,20 +12,20 @@ namespace skia {
 
 // 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(const Pickle& pickle, PickleIterator* iter,
-                         SkString* str);
+SK_API bool ReadSkString(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(const Pickle& pickle, PickleIterator* iter,
+SK_API bool ReadSkFontIdentity(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