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, 13 insertions, 12 deletions

diff --git a/ui/base/clipboard/clipboard_test_template.h b/ui/base/clipboard/clipboard_test_template.h
index 2c5827f..b5df843 100644
--- a/ui/base/clipboard/clipboard_test_template.h
+++ b/ui/base/clipboard/clipboard_test_template.h
@@ -415,7 +415,7 @@ TYPED_TEST(ClipboardTest, DataTest) {
   Pickle read_pickle(output.data(), output.size());
   PickleIterator iter(read_pickle);
   std::string unpickled_string;
-  ASSERT_TRUE(iter.ReadString(&unpickled_string));
+  ASSERT_TRUE(read_pickle.ReadString(&iter, &unpickled_string));
   EXPECT_EQ(payload, unpickled_string);
 }
 
@@ -450,7 +450,7 @@ TYPED_TEST(ClipboardTest, MultipleDataTest) {
   Pickle read_pickle2(output2.data(), output2.size());
   PickleIterator iter2(read_pickle2);
   std::string unpickled_string2;
-  ASSERT_TRUE(iter2.ReadString(&unpickled_string2));
+  ASSERT_TRUE(read_pickle2.ReadString(&iter2, &unpickled_string2));
   EXPECT_EQ(payload2, unpickled_string2);
 
   {
@@ -471,7 +471,7 @@ TYPED_TEST(ClipboardTest, MultipleDataTest) {
   Pickle read_pickle1(output1.data(), output1.size());
   PickleIterator iter1(read_pickle1);
   std::string unpickled_string1;
-  ASSERT_TRUE(iter1.ReadString(&unpickled_string1));
+  ASSERT_TRUE(read_pickle1.ReadString(&iter1, &unpickled_string1));
   EXPECT_EQ(payload1, unpickled_string1);
 }
 
diff --git a/ui/base/clipboard/custom_data_helper.cc b/ui/base/clipboard/custom_data_helper.cc
index b715446..323a92e 100644
--- a/ui/base/clipboard/custom_data_helper.cc
+++ b/ui/base/clipboard/custom_data_helper.cc
@@ -30,7 +30,7 @@ bool SkippablePickle::SkipString16(PickleIterator* iter) {
   DCHECK(iter);
 
   int len;
-  if (!iter->ReadLength(&len))
+  if (!ReadLength(iter, &len))
     return false;
   return iter->SkipBytes(len * sizeof(base::char16));
 }
@@ -44,7 +44,7 @@ void ReadCustomDataTypes(const void* data,
   PickleIterator iter(pickle);
 
   size_t size = 0;
-  if (!iter.ReadSizeT(&size))
+  if (!pickle.ReadSizeT(&iter, &size))
     return;
 
   // Keep track of the original elements in the types vector. On failure, we
@@ -54,7 +54,8 @@ void ReadCustomDataTypes(const void* data,
 
   for (size_t i = 0; i < size; ++i) {
     types->push_back(base::string16());
-    if (!iter.ReadString16(&types->back()) || !pickle.SkipString16(&iter)) {
+    if (!pickle.ReadString16(&iter, &types->back()) ||
+        !pickle.SkipString16(&iter)) {
       types->resize(original_size);
       return;
     }
@@ -69,15 +70,15 @@ void ReadCustomDataForType(const void* data,
   PickleIterator iter(pickle);
 
   size_t size = 0;
-  if (!iter.ReadSizeT(&size))
+  if (!pickle.ReadSizeT(&iter, &size))
     return;
 
   for (size_t i = 0; i < size; ++i) {
     base::string16 deserialized_type;
-    if (!iter.ReadString16(&deserialized_type))
+    if (!pickle.ReadString16(&iter, &deserialized_type))
       return;
     if (deserialized_type == type) {
-      ignore_result(iter.ReadString16(result));
+      ignore_result(pickle.ReadString16(&iter, result));
       return;
     }
     if (!pickle.SkipString16(&iter))
@@ -92,19 +93,19 @@ void ReadCustomDataIntoMap(const void* data,
   PickleIterator iter(pickle);
 
   size_t size = 0;
-  if (!iter.ReadSizeT(&size))
+  if (!pickle.ReadSizeT(&iter, &size))
     return;
 
   for (size_t i = 0; i < size; ++i) {
     base::string16 type;
-    if (!iter.ReadString16(&type)) {
+    if (!pickle.ReadString16(&iter, &type)) {
       // Data is corrupt, return an empty map.
       result->clear();
       return;
     }
     std::pair<std::map<base::string16, base::string16>::iterator, bool>
         insert_result = result->insert(std::make_pair(type, base::string16()));
-    if (!iter.ReadString16(&insert_result.first->second)) {
+    if (!pickle.ReadString16(&iter, &insert_result.first->second)) {
       // Data is corrupt, return an empty map.
       result->clear();
       return;