Change most uses of Pickle to base::Pickle

extensions/browser/sandboxed_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 "extensions/browser/sandboxed_unpacker.h"
 
 #include <set>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 172 matching lines @@
 // |extension_path| is the path to the extension we unpacked that wrote the
 // data. Returns true on success.
 bool ReadImagesFromFile(const base::FilePath& extension_path,
                         DecodedImages* images) {
   base::FilePath path = extension_path.AppendASCII(kDecodedImagesFilename);
   std::string file_str;
   if (!base::ReadFileToString(path, &file_str))
     return false;
 
   IPC::Message pickle(file_str.data(), file_str.size());
-  PickleIterator iter(pickle);
+  base::PickleIterator iter(pickle);
   return IPC::ReadParam(&pickle, &iter, images);
 }
 
 // Read the decoded message catalogs back from the file we saved them to.
 // |extension_path| is the path to the extension we unpacked that wrote the
 // data. Returns true on success.
 bool ReadMessageCatalogsFromFile(const base::FilePath& extension_path,
                                  base::DictionaryValue* catalogs) {
   base::FilePath path =
       extension_path.AppendASCII(kDecodedMessageCatalogsFilename);
   std::string file_str;
   if (!base::ReadFileToString(path, &file_str))
     return false;
 
   IPC::Message pickle(file_str.data(), file_str.size());
-  PickleIterator iter(pickle);
+  base::PickleIterator iter(pickle);
   return IPC::ReadParam(&pickle, &iter, catalogs);
 }
 
 }  // namespace
 
 SandboxedUnpackerClient::SandboxedUnpackerClient()
     : RefCountedDeleteOnMessageLoop<SandboxedUnpackerClient>(
           content::BrowserThread::GetMessageLoopProxyForThread(
               content::BrowserThread::UI)) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ skipping 633 matching lines @@
 
 void SandboxedUnpacker::Cleanup() {
   DCHECK(unpacker_io_task_runner_->RunsTasksOnCurrentThread());
   if (!temp_dir_.Delete()) {
     LOG(WARNING) << "Can not delete temp directory at "
                  << temp_dir_.path().value();
   }
 }
 
 }  // namespace extensions