Refactor Pickle Read methods to use higher performance PickleIterator.

chrome/common/extensions/extension_unpacker.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 "chrome/common/extensions/extension_unpacker.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 234 matching lines @@
 
 // static
 bool ExtensionUnpacker::ReadImagesFromFile(const FilePath& extension_path,
                                            DecodedImages* images) {
   FilePath path = extension_path.AppendASCII(filenames::kDecodedImagesFilename);
   std::string file_str;
   if (!file_util::ReadFileToString(path, &file_str))
     return false;
 
   IPC::Message pickle(file_str.data(), file_str.size());
-  void* iter = NULL;
+  PickleIterator iter(pickle);
   return IPC::ReadParam(&pickle, &iter, images);
 }
 
 // static
 bool ExtensionUnpacker::ReadMessageCatalogsFromFile(
     const FilePath& extension_path, DictionaryValue* catalogs) {
   FilePath path = extension_path.AppendASCII(
       filenames::kDecodedMessageCatalogsFilename);
   std::string file_str;
   if (!file_util::ReadFileToString(path, &file_str))
     return false;
 
   IPC::Message pickle(file_str.data(), file_str.size());
-  void* iter = NULL;
+  PickleIterator iter(pickle);
   return IPC::ReadParam(&pickle, &iter, catalogs);
 }
 
 bool ExtensionUnpacker::AddDecodedImage(const FilePath& path) {
   // Make sure it's not referencing a file outside the extension's subdir.
   if (path.IsAbsolute() || PathContainsParentDirectory(path)) {
     SetError(kPathNamesMustBeAbsoluteOrLocalError);
     return false;
   }
 
@@ skipping 39 matching lines @@
     return false;
   }
   parsed_catalogs_->Set(dir_name, root.release());
 
   return true;
 }
 
 void ExtensionUnpacker::SetError(const std::string &error) {
   error_message_ = UTF8ToUTF16(error);
 }