Change most uses of Pickle to base::Pickle

There should be no behavior change.

TBR=jschuh (IPC messages)

Review URL: https://codereview.chromium.org/1154283003

Cr-Commit-Position: refs/heads/master@{#332552}

3 files changed, 23 insertions, 22 deletions

diff --git a/ui/base/clipboard/custom_data_helper.cc b/ui/base/clipboard/custom_data_helper.cc
index b715446..a50a0a0 100644
--- a/ui/base/clipboard/custom_data_helper.cc
+++ b/ui/base/clipboard/custom_data_helper.cc
@@ -16,17 +16,17 @@ namespace ui {
 
 namespace {
 
-class SkippablePickle : public Pickle {
+class SkippablePickle : public base::Pickle {
  public:
   SkippablePickle(const void* data, size_t data_len);
-  bool SkipString16(PickleIterator* iter);
+  bool SkipString16(base::PickleIterator* iter);
 };
 
 SkippablePickle::SkippablePickle(const void* data, size_t data_len)
-    : Pickle(reinterpret_cast<const char*>(data), data_len) {
+    : base::Pickle(reinterpret_cast<const char*>(data), data_len) {
 }
 
-bool SkippablePickle::SkipString16(PickleIterator* iter) {
+bool SkippablePickle::SkipString16(base::PickleIterator* iter) {
   DCHECK(iter);
 
   int len;
@@ -41,7 +41,7 @@ void ReadCustomDataTypes(const void* data,
                          size_t data_length,
                          std::vector<base::string16>* types) {
   SkippablePickle pickle(data, data_length);
-  PickleIterator iter(pickle);
+  base::PickleIterator iter(pickle);
 
   size_t size = 0;
   if (!iter.ReadSizeT(&size))
@@ -66,7 +66,7 @@ void ReadCustomDataForType(const void* data,
                            const base::string16& type,
                            base::string16* result) {
   SkippablePickle pickle(data, data_length);
-  PickleIterator iter(pickle);
+  base::PickleIterator iter(pickle);
 
   size_t size = 0;
   if (!iter.ReadSizeT(&size))
@@ -88,8 +88,8 @@ void ReadCustomDataForType(const void* data,
 void ReadCustomDataIntoMap(const void* data,
                            size_t data_length,
                            std::map<base::string16, base::string16>* result) {
-  Pickle pickle(reinterpret_cast<const char*>(data), data_length);
-  PickleIterator iter(pickle);
+  base::Pickle pickle(reinterpret_cast<const char*>(data), data_length);
+  base::PickleIterator iter(pickle);
 
   size_t size = 0;
   if (!iter.ReadSizeT(&size))
@@ -114,7 +114,7 @@ void ReadCustomDataIntoMap(const void* data,
 
 void WriteCustomDataToPickle(
     const std::map<base::string16, base::string16>& data,
-    Pickle* pickle) {
+    base::Pickle* pickle) {
   pickle->WriteSizeT(data.size());
   for (std::map<base::string16, base::string16>::const_iterator it =
            data.begin();
diff --git a/ui/base/clipboard/custom_data_helper_unittest.cc b/ui/base/clipboard/custom_data_helper_unittest.cc
index a765852..1ed53c6 100644
--- a/ui/base/clipboard/custom_data_helper_unittest.cc
+++ b/ui/base/clipboard/custom_data_helper_unittest.cc
@@ -16,12 +16,12 @@ namespace ui {
 
 namespace {
 
-void PrepareEmptyTestData(Pickle* pickle) {
+void PrepareEmptyTestData(base::Pickle* pickle) {
   std::map<base::string16, base::string16> data;
   WriteCustomDataToPickle(data, pickle);
 }
 
-void PrepareTestData(Pickle* pickle) {
+void PrepareTestData(base::Pickle* pickle) {
   std::map<base::string16, base::string16> data;
   data.insert(std::make_pair(ASCIIToUTF16("abc"), base::string16()));
   data.insert(std::make_pair(ASCIIToUTF16("de"), ASCIIToUTF16("1")));
@@ -30,7 +30,7 @@ void PrepareTestData(Pickle* pickle) {
 }
 
 TEST(CustomDataHelperTest, EmptyReadTypes) {
-  Pickle pickle;
+  base::Pickle pickle;
   PrepareEmptyTestData(&pickle);
 
   std::vector<base::string16> types;
@@ -39,7 +39,7 @@ TEST(CustomDataHelperTest, EmptyReadTypes) {
 }
 
 TEST(CustomDataHelperTest, EmptyReadSingleType) {
-  Pickle pickle;
+  base::Pickle pickle;
   PrepareEmptyTestData(&pickle);
 
   base::string16 result;
@@ -51,7 +51,7 @@ TEST(CustomDataHelperTest, EmptyReadSingleType) {
 }
 
 TEST(CustomDataHelperTest, EmptyReadMap) {
-  Pickle pickle;
+  base::Pickle pickle;
   PrepareEmptyTestData(&pickle);
 
   std::map<base::string16, base::string16> result;
@@ -60,7 +60,7 @@ TEST(CustomDataHelperTest, EmptyReadMap) {
 }
 
 TEST(CustomDataHelperTest, ReadTypes) {
-  Pickle pickle;
+  base::Pickle pickle;
   PrepareTestData(&pickle);
 
   std::vector<base::string16> types;
@@ -74,7 +74,7 @@ TEST(CustomDataHelperTest, ReadTypes) {
 }
 
 TEST(CustomDataHelperTest, ReadSingleType) {
-  Pickle pickle;
+  base::Pickle pickle;
   PrepareTestData(&pickle);
 
   base::string16 result;
@@ -98,7 +98,7 @@ TEST(CustomDataHelperTest, ReadSingleType) {
 }
 
 TEST(CustomDataHelperTest, ReadMap) {
-  Pickle pickle;
+  base::Pickle pickle;
   PrepareTestData(&pickle);
 
   std::map<base::string16, base::string16> result;
@@ -119,7 +119,7 @@ TEST(CustomDataHelperTest, BadReadTypes) {
   expected.push_back(ASCIIToUTF16("de"));
   expected.push_back(ASCIIToUTF16("f"));
 
-  Pickle malformed;
+  base::Pickle malformed;
   malformed.WriteSizeT(1000);
   malformed.WriteString16(ASCIIToUTF16("hello"));
   malformed.WriteString16(ASCIIToUTF16("world"));
@@ -127,7 +127,7 @@ TEST(CustomDataHelperTest, BadReadTypes) {
   ReadCustomDataTypes(malformed.data(), malformed.size(), &actual);
   EXPECT_EQ(expected, actual);
 
-  Pickle malformed2;
+  base::Pickle malformed2;
   malformed2.WriteSizeT(1);
   malformed2.WriteString16(ASCIIToUTF16("hello"));
   std::vector<base::string16> actual2(expected);
@@ -139,7 +139,7 @@ TEST(CustomDataHelperTest, BadPickle) {
   base::string16 result_data;
   std::map<base::string16, base::string16> result_map;
 
-  Pickle malformed;
+  base::Pickle malformed;
   malformed.WriteSizeT(1000);
   malformed.WriteString16(ASCIIToUTF16("hello"));
   malformed.WriteString16(ASCIIToUTF16("world"));
@@ -152,7 +152,7 @@ TEST(CustomDataHelperTest, BadPickle) {
   EXPECT_EQ(0u, result_data.size());
   EXPECT_EQ(0u, result_map.size());
 
-  Pickle malformed2;
+  base::Pickle malformed2;
   malformed2.WriteSizeT(1);
   malformed2.WriteString16(ASCIIToUTF16("hello"));
 
diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
index 5044f62..6850cd4 100644
--- a/ui/base/clipboard/scoped_clipboard_writer.cc
+++ b/ui/base/clipboard/scoped_clipboard_writer.cc
@@ -103,7 +103,8 @@ void ScopedClipboardWriter::WriteImage(const SkBitmap& bitmap) {
 }
 
 void ScopedClipboardWriter::WritePickledData(
-    const Pickle& pickle, const Clipboard::FormatType& format) {
+    const base::Pickle& pickle,
+    const Clipboard::FormatType& format) {
   std::string format_string = format.Serialize();
   Clipboard::ObjectMapParam format_parameter(format_string.begin(),
                                              format_string.end());