Change most uses of Pickle to base::Pickle

components/nacl/browser/nacl_validation_cache.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 "components/nacl/browser/nacl_validation_cache.h"
 
 #include "base/pickle.h"
 #include "base/rand_util.h"
 
 namespace nacl {
@@ skipping 34 matching lines @@
   }
   return false;
 }
 
 void NaClValidationCache::SetKnownToValidate(const std::string& signature) {
   if (signature.length() == kValidationCacheEntrySize) {
     validation_cache_.Put(signature, true);
   }
 }
 
-void NaClValidationCache::Serialize(Pickle* pickle) const {
+void NaClValidationCache::Serialize(base::Pickle* pickle) const {
   // Mark the beginning of the data stream.
   pickle->WriteString(kValidationCacheBeginMagic);
   pickle->WriteString(validation_cache_key_);
   pickle->WriteInt(validation_cache_.size());
 
   // Serialize the cache in reverse order so that deserializing it can easily
   // preserve the MRU order.  (Last item deserialized => most recently used.)
   ValidationCacheType::const_reverse_iterator iter;
   for (iter = validation_cache_.rbegin();
        iter != validation_cache_.rend();
        ++iter) {
     pickle->WriteString(iter->first);
   }
 
   // Mark the end of the data stream.
   pickle->WriteString(kValidationCacheEndMagic);
 }
 
 void NaClValidationCache::Reset() {
   validation_cache_key_ = base::RandBytesAsString(kValidationCacheKeySize);
   validation_cache_.Clear();
 }
 
-bool NaClValidationCache::Deserialize(const Pickle* pickle) {
+bool NaClValidationCache::Deserialize(const base::Pickle* pickle) {
   bool success = DeserializeImpl(pickle);
   if (!success) {
     Reset();
   }
   return success;
 }
 
-bool NaClValidationCache::DeserializeImpl(const Pickle* pickle) {
-  PickleIterator iter(*pickle);
+bool NaClValidationCache::DeserializeImpl(const base::Pickle* pickle) {
+  base::PickleIterator iter(*pickle);
   std::string buffer;
   int count;
 
   // Magic
   if (!iter.ReadString(&buffer))
     return false;
   if (0 != buffer.compare(kValidationCacheBeginMagic))
     return false;
 
   // Key
@@ skipping 21 matching lines @@
     return false;
   if (0 != buffer.compare(kValidationCacheEndMagic))
     return false;
 
   // Success!
   return true;
 }
 
 } // namespace nacl