Change most uses of Pickle to base::Pickle

components/autofill/core/common/form_data_unittest.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/autofill/core/common/form_data.h"
 
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
 
 namespace {
 
 // This function serializes the form data into the pickle in version one format.
 // It should always be possible to deserialize it using DeserializeFormData(),
 // even when version changes. See kPickleVersion in form_data.cc.
-void SerializeInVersion1Format(const FormData& form_data, Pickle* pickle) {
+void SerializeInVersion1Format(const FormData& form_data,
+                               base::Pickle* pickle) {
   DCHECK_EQ(true, form_data.is_form_tag);
   pickle->WriteInt(1);
   pickle->WriteString16(form_data.name);
   base::string16 method(base::ASCIIToUTF16("POST"));
   pickle->WriteString16(method);
   pickle->WriteString(form_data.origin.spec());
   pickle->WriteString(form_data.action.spec());
   pickle->WriteBool(form_data.user_submitted);
   pickle->WriteInt(static_cast<int>(form_data.fields.size()));
   for (size_t i = 0; i < form_data.fields.size(); ++i) {
     SerializeFormFieldData(form_data.fields[i], pickle);
   }
 }
 
-void SerializeInVersion2Format(const FormData& form_data, Pickle* pickle) {
+void SerializeInVersion2Format(const FormData& form_data,
+                               base::Pickle* pickle) {
   DCHECK_EQ(true, form_data.is_form_tag);
   pickle->WriteInt(2);
   pickle->WriteString16(form_data.name);
   pickle->WriteString(form_data.origin.spec());
   pickle->WriteString(form_data.action.spec());
   pickle->WriteBool(form_data.user_submitted);
   pickle->WriteInt(static_cast<int>(form_data.fields.size()));
   for (size_t i = 0; i < form_data.fields.size(); ++i) {
     SerializeFormFieldData(form_data.fields[i], pickle);
   }
 }
 
 // This function serializes the form data into the pickle in incorrect format
 // (no version number).
-void SerializeIncorrectFormat(const FormData& form_data, Pickle* pickle) {
+void SerializeIncorrectFormat(const FormData& form_data, base::Pickle* pickle) {
   pickle->WriteString16(form_data.name);
   pickle->WriteString(form_data.origin.spec());
   pickle->WriteString(form_data.action.spec());
   pickle->WriteBool(form_data.user_submitted);
   pickle->WriteInt(static_cast<int>(form_data.fields.size()));
   for (size_t i = 0; i < form_data.fields.size(); ++i) {
     SerializeFormFieldData(form_data.fields[i], pickle);
   }
 }
 
@@ skipping 30 matching lines @@
   data->fields.push_back(field_data);
 }
 
 }  // namespace
 
 TEST(FormDataTest, SerializeAndDeserialize) {
   FormData data;
   FillInDummyFormData(&data);
   data.is_form_tag = false;
 
-  Pickle pickle;
+  base::Pickle pickle;
   SerializeFormData(data, &pickle);
 
-  PickleIterator iter(pickle);
+  base::PickleIterator iter(pickle);
   FormData actual;
   EXPECT_TRUE(DeserializeFormData(&iter, &actual));
 
   EXPECT_TRUE(actual.SameFormAs(data));
 }
 
 TEST(FormDataTest, Serialize_v1_Deserialize_vCurrent) {
   FormData data;
   FillInDummyFormData(&data);
 
-  Pickle pickle;
+  base::Pickle pickle;
   SerializeInVersion1Format(data, &pickle);
 
-  PickleIterator iter(pickle);
+  base::PickleIterator iter(pickle);
   FormData actual;
   EXPECT_TRUE(DeserializeFormData(&iter, &actual));
 
   EXPECT_TRUE(actual.SameFormAs(data));
 }
 
 TEST(FormDataTest, Serialize_v2_Deserialize_vCurrent) {
   FormData data;
   FillInDummyFormData(&data);
 
-  Pickle pickle;
+  base::Pickle pickle;
   SerializeInVersion2Format(data, &pickle);
 
-  PickleIterator iter(pickle);
+  base::PickleIterator iter(pickle);
   FormData actual;
   EXPECT_TRUE(DeserializeFormData(&iter, &actual));
 
   EXPECT_TRUE(actual.SameFormAs(data));
 }
 
 TEST(FormDataTest, SerializeIncorrectFormatAndDeserialize) {
   FormData data;
   FillInDummyFormData(&data);
 
-  Pickle pickle;
+  base::Pickle pickle;
   SerializeIncorrectFormat(data, &pickle);
 
-  PickleIterator iter(pickle);
+  base::PickleIterator iter(pickle);
   FormData actual;
   EXPECT_FALSE(DeserializeFormData(&iter, &actual));
 
   FormData empty;
   EXPECT_TRUE(actual.SameFormAs(empty));
 }
 
 TEST(FormDataTest, SerializeAndDeserializeInStrings) {
   FormData data;
   FillInDummyFormData(&data);
   data.is_form_tag = false;
 
   std::string serialized_data;
   SerializeFormDataToBase64String(data, &serialized_data);
 
   FormData actual;
   EXPECT_TRUE(DeserializeFormDataFromBase64String(serialized_data, &actual));
 
   EXPECT_TRUE(actual.SameFormAs(data));
 }
 
 }  // namespace autofill