Revert of Remove deprecated methods from Pickle.

storage/browser/fileapi/sandbox_prioritized_origin_database.cc

 // Copyright 2013 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/sandbox_prioritized_origin_database.h"
 
 #include "base/files/file.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/pickle.h"
@@ skipping 26 matching lines @@
   return true;
 }
 
 bool ReadPrimaryOriginFile(const base::FilePath& path,
                            std::string* origin) {
   std::string buffer;
   if (!base::ReadFileToString(path, &buffer))
     return false;
   Pickle pickle(buffer.data(), buffer.size());
   PickleIterator iter(pickle);
-  return iter.ReadString(origin) && !origin->empty();
+  return pickle.ReadString(&iter, origin) && !origin->empty();
 }
 
 }  // namespace
 
 SandboxPrioritizedOriginDatabase::SandboxPrioritizedOriginDatabase(
     const base::FilePath& file_system_directory,
     leveldb::Env* env_override)
     : file_system_directory_(file_system_directory),
       env_override_(env_override),
       primary_origin_file_(
@@ skipping 158 matching lines @@
   }
 }
 
 SandboxOriginDatabase*
 SandboxPrioritizedOriginDatabase::GetSandboxOriginDatabase() {
   MaybeInitializeNonPrimaryDatabase(true);
   return origin_database_.get();
 }
 
 }  // namespace storage