Revert of Remove deprecated methods from Pickle.

ui/base/clipboard/custom_data_helper.cc

Index: ui/base/clipboard/custom_data_helper.cc
diff --git a/ui/base/clipboard/custom_data_helper.cc b/ui/base/clipboard/custom_data_helper.cc
index b71544646a129009127e01beaa01488f7da107af..323a92e1cc6d1309acad3906746296062d8ece81 100644
--- a/ui/base/clipboard/custom_data_helper.cc
+++ b/ui/base/clipboard/custom_data_helper.cc
@@ -30,7 +30,7 @@
   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 @@
   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 @@
 
   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 @@
   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 @@
   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;