Change most uses of Pickle to base::Pickle

android_webview/native/state_serializer.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 "android_webview/native/state_serializer.h"
 
 #include <string>
 
 #include "base/memory/scoped_vector.h"
 #include "base/pickle.h"
@@ skipping 22 matching lines @@
 namespace {
 
 // Sanity check value that we are restoring from a valid pickle.
 // This can potentially used as an actual serialization version number in the
 // future if we ever decide to support restoring from older versions.
 const uint32 AW_STATE_VERSION = 20130814;
 
 }  // namespace
 
 bool WriteToPickle(const content::WebContents& web_contents,
-                   Pickle* pickle) {
+                   base::Pickle* pickle) {
   DCHECK(pickle);
 
   if (!internal::WriteHeaderToPickle(pickle))
     return false;
 
   const content::NavigationController& controller =
       web_contents.GetController();
   const int entry_count = controller.GetEntryCount();
   const int selected_entry = controller.GetCurrentEntryIndex();
   DCHECK_GE(entry_count, 0);
@@ skipping 10 matching lines @@
     if (!internal::WriteNavigationEntryToPickle(*controller.GetEntryAtIndex(i),
                                                 pickle))
       return false;
   }
 
   // Please update AW_STATE_VERSION if serialization format is changed.
 
   return true;
 }
 
-bool RestoreFromPickle(PickleIterator* iterator,
+bool RestoreFromPickle(base::PickleIterator* iterator,
                        content::WebContents* web_contents) {
   DCHECK(iterator);
   DCHECK(web_contents);
 
   if (!internal::RestoreHeaderFromPickle(iterator))
     return false;
 
   int entry_count = -1;
   int selected_entry = -2;  // -1 is a valid value
 
@@ skipping 44 matching lines @@
     }
   }
 
   controller.LoadIfNecessary();
 
   return true;
 }
 
 namespace internal {
 
-bool WriteHeaderToPickle(Pickle* pickle) {
+bool WriteHeaderToPickle(base::Pickle* pickle) {
   return pickle->WriteUInt32(AW_STATE_VERSION);
 }
 
-bool RestoreHeaderFromPickle(PickleIterator* iterator) {
+bool RestoreHeaderFromPickle(base::PickleIterator* iterator) {
   uint32 state_version = -1;
   if (!iterator->ReadUInt32(&state_version))
     return false;
 
   if (AW_STATE_VERSION != state_version)
     return false;
 
   return true;
 }
 
 bool WriteNavigationEntryToPickle(const content::NavigationEntry& entry,
-                                  Pickle* pickle) {
+                                  base::Pickle* pickle) {
   if (!pickle->WriteString(entry.GetURL().spec()))
     return false;
 
   if (!pickle->WriteString(entry.GetVirtualURL().spec()))
     return false;
 
   const content::Referrer& referrer = entry.GetReferrer();
   if (!pickle->WriteString(referrer.url.spec()))
     return false;
   if (!pickle->WriteInt(static_cast<int>(referrer.policy)))
@@ skipping 21 matching lines @@
     return false;
 
   if (!pickle->WriteInt(entry.GetHttpStatusCode()))
     return false;
 
   // Please update AW_STATE_VERSION if serialization format is changed.
 
   return true;
 }
 
-bool RestoreNavigationEntryFromPickle(PickleIterator* iterator,
+bool RestoreNavigationEntryFromPickle(base::PickleIterator* iterator,
                                       content::NavigationEntry* entry) {
   {
     string url;
     if (!iterator->ReadString(&url))
       return false;
     entry->SetURL(GURL(url));
   }
 
   {
     string virtual_url;
@@ skipping 73 matching lines @@
       return false;
     entry->SetHttpStatusCode(http_status_code);
   }
 
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace android_webview