Revert of Remove deprecated methods from Pickle.

storage/browser/fileapi/file_system_usage_cache.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "storage/browser/fileapi/file_system_usage_cache.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
@@ skipping 167 matching lines @@
   char buffer[kUsageFileSize];
   const char *header;
   if (usage_file_path.empty() ||
       !ReadBytes(usage_file_path, buffer, kUsageFileSize))
     return false;
   Pickle read_pickle(buffer, kUsageFileSize);
   PickleIterator iter(read_pickle);
   uint32 dirty = 0;
   int64 usage = 0;
 
-  if (!iter.ReadBytes(&header, kUsageFileHeaderSize) ||
-      !iter.ReadBool(is_valid) ||
-      !iter.ReadUInt32(&dirty) ||
-      !iter.ReadInt64(&usage))
+  if (!read_pickle.ReadBytes(&iter, &header, kUsageFileHeaderSize) ||
+      !read_pickle.ReadBool(&iter, is_valid) ||
+      !read_pickle.ReadUInt32(&iter, &dirty) ||
+      !read_pickle.ReadInt64(&iter, &usage))
     return false;
 
   if (header[0] != kUsageFileHeader[0] ||
       header[1] != kUsageFileHeader[1] ||
       header[2] != kUsageFileHeader[2] ||
       header[3] != kUsageFileHeader[3])
     return false;
 
   *dirty_out = dirty;
   *usage_out = usage;
@@ skipping 96 matching lines @@
   return !task_runner_.get() || task_runner_->RunsTasksOnCurrentThread();
 }
 
 bool FileSystemUsageCache::HasCacheFileHandle(const base::FilePath& file_path) {
   DCHECK(CalledOnValidThread());
   DCHECK_LE(cache_files_.size(), kMaxHandleCacheSize);
   return ContainsKey(cache_files_, file_path);
 }
 
 }  // namespace storage