Move Pickle to base namespace.

Updates forward-declares and headers, but keeps a using statement in to avoid updating all users atomically.

TBR=jschuh for IPC stuff

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

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

8 files changed, 33 insertions, 26 deletions

diff --git a/ui/base/clipboard/clipboard_test_template.h b/ui/base/clipboard/clipboard_test_template.h
index 9d51921..844266b 100644
--- a/ui/base/clipboard/clipboard_test_template.h
+++ b/ui/base/clipboard/clipboard_test_template.h
@@ -398,7 +398,7 @@ TYPED_TEST(ClipboardTest, DataTest) {
   const ui::Clipboard::FormatType kFormat =
       ui::Clipboard::GetFormatType("chromium/x-test-format");
   std::string payload("test string");
-  Pickle write_pickle;
+  base::Pickle write_pickle;
   write_pickle.WriteString(payload);
 
   {
@@ -412,8 +412,8 @@ TYPED_TEST(ClipboardTest, DataTest) {
   this->clipboard().ReadData(kFormat, &output);
   ASSERT_FALSE(output.empty());
 
-  Pickle read_pickle(output.data(), output.size());
-  PickleIterator iter(read_pickle);
+  base::Pickle read_pickle(output.data(), output.size());
+  base::PickleIterator iter(read_pickle);
   std::string unpickled_string;
   ASSERT_TRUE(iter.ReadString(&unpickled_string));
   EXPECT_EQ(payload, unpickled_string);
@@ -423,13 +423,13 @@ TYPED_TEST(ClipboardTest, MultipleDataTest) {
   const ui::Clipboard::FormatType kFormat1 =
       ui::Clipboard::GetFormatType("chromium/x-test-format1");
   std::string payload1("test string1");
-  Pickle write_pickle1;
+  base::Pickle write_pickle1;
   write_pickle1.WriteString(payload1);
 
   const ui::Clipboard::FormatType kFormat2 =
       ui::Clipboard::GetFormatType("chromium/x-test-format2");
   std::string payload2("test string2");
-  Pickle write_pickle2;
+  base::Pickle write_pickle2;
   write_pickle2.WriteString(payload2);
 
   {
@@ -447,8 +447,8 @@ TYPED_TEST(ClipboardTest, MultipleDataTest) {
   this->clipboard().ReadData(kFormat2, &output2);
   ASSERT_FALSE(output2.empty());
 
-  Pickle read_pickle2(output2.data(), output2.size());
-  PickleIterator iter2(read_pickle2);
+  base::Pickle read_pickle2(output2.data(), output2.size());
+  base::PickleIterator iter2(read_pickle2);
   std::string unpickled_string2;
   ASSERT_TRUE(iter2.ReadString(&unpickled_string2));
   EXPECT_EQ(payload2, unpickled_string2);
@@ -468,8 +468,8 @@ TYPED_TEST(ClipboardTest, MultipleDataTest) {
   this->clipboard().ReadData(kFormat1, &output1);
   ASSERT_FALSE(output1.empty());
 
-  Pickle read_pickle1(output1.data(), output1.size());
-  PickleIterator iter1(read_pickle1);
+  base::Pickle read_pickle1(output1.data(), output1.size());
+  base::PickleIterator iter1(read_pickle1);
   std::string unpickled_string1;
   ASSERT_TRUE(iter1.ReadString(&unpickled_string1));
   EXPECT_EQ(payload1, unpickled_string1);
@@ -636,7 +636,7 @@ TYPED_TEST(ClipboardTest, WriteHyperlinkEmptyParams) {
 
 TYPED_TEST(ClipboardTest, WritePickledData) {
   ScopedClipboardWriter scw(CLIPBOARD_TYPE_COPY_PASTE);
-  scw.WritePickledData(Pickle(), Clipboard::GetPlainTextFormatType());
+  scw.WritePickledData(base::Pickle(), Clipboard::GetPlainTextFormatType());
 }
 
 TYPED_TEST(ClipboardTest, WriteImageEmptyParams) {
diff --git a/ui/base/clipboard/custom_data_helper.h b/ui/base/clipboard/custom_data_helper.h
index 8c927aa..c1778c7 100644
--- a/ui/base/clipboard/custom_data_helper.h
+++ b/ui/base/clipboard/custom_data_helper.h
@@ -16,7 +16,9 @@
 #include "base/strings/string16.h"
 #include "ui/base/ui_base_export.h"
 
+namespace base {
 class Pickle;
+}
 
 #if defined(OS_MACOSX)
 #ifdef __OBJC__
@@ -48,7 +50,7 @@ UI_BASE_EXPORT void ReadCustomDataIntoMap(
 
 UI_BASE_EXPORT void WriteCustomDataToPickle(
     const std::map<base::string16, base::string16>& data,
-    Pickle* pickle);
+    base::Pickle* pickle);
 
 }  // namespace ui
 
diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
index ba7f1a5..664dc23 100644
--- a/ui/base/clipboard/scoped_clipboard_writer.h
+++ b/ui/base/clipboard/scoped_clipboard_writer.h
@@ -18,7 +18,9 @@
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/ui_base_export.h"
 
+namespace base {
 class Pickle;
+}
 
 namespace ui {
 
@@ -59,7 +61,7 @@ class UI_BASE_EXPORT ScopedClipboardWriter {
   void WriteWebSmartPaste();
 
   // Adds arbitrary pickled data to clipboard.
-  void WritePickledData(const Pickle& pickle,
+  void WritePickledData(const base::Pickle& pickle,
                         const Clipboard::FormatType& format);
 
   void WriteImage(const SkBitmap& bitmap);
diff --git a/ui/base/dragdrop/os_exchange_data.h b/ui/base/dragdrop/os_exchange_data.h
index 539e894..55e8e56 100644
--- a/ui/base/dragdrop/os_exchange_data.h
+++ b/ui/base/dragdrop/os_exchange_data.h
@@ -22,7 +22,10 @@
 #include "ui/base/ui_base_export.h"
 
 class GURL;
+
+namespace base {
 class Pickle;
+}
 
 namespace gfx {
 class ImageSkia;
@@ -100,7 +103,7 @@ class UI_BASE_EXPORT OSExchangeData {
     virtual void SetFilenames(
         const std::vector<FileInfo>& file_names) = 0;
     virtual void SetPickledData(const CustomFormat& format,
-                                const Pickle& data) = 0;
+                                const base::Pickle& data) = 0;
 
     virtual bool GetString(base::string16* data) const = 0;
     virtual bool GetURLAndTitle(FilenameToURLPolicy policy,
@@ -110,7 +113,7 @@ class UI_BASE_EXPORT OSExchangeData {
     virtual bool GetFilenames(
         std::vector<FileInfo>* file_names) const = 0;
     virtual bool GetPickledData(const CustomFormat& format,
-                                Pickle* data) const = 0;
+                                base::Pickle* data) const = 0;
 
     virtual bool HasString() const = 0;
     virtual bool HasURL(FilenameToURLPolicy policy) const = 0;
@@ -181,7 +184,7 @@ class UI_BASE_EXPORT OSExchangeData {
   void SetFilenames(
       const std::vector<FileInfo>& file_names);
   // Adds pickled data of the specified format.
-  void SetPickledData(const CustomFormat& format, const Pickle& data);
+  void SetPickledData(const CustomFormat& format, const base::Pickle& data);
 
   // These functions retrieve data of the specified type. If data exists, the
   // functions return and the result is in the out parameter. If the data does
@@ -195,7 +198,7 @@ class UI_BASE_EXPORT OSExchangeData {
   bool GetFilename(base::FilePath* path) const;
   bool GetFilenames(
       std::vector<FileInfo>* file_names) const;
-  bool GetPickledData(const CustomFormat& format, Pickle* data) const;
+  bool GetPickledData(const CustomFormat& format, base::Pickle* data) const;
 
   // Test whether or not data of certain types is present, without actually
   // returning anything.
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.h b/ui/base/dragdrop/os_exchange_data_provider_aura.h
index b489bcb..87f0b5a 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aura.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_aura.h
@@ -34,7 +34,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderAura
   void SetFilename(const base::FilePath& path) override;
   void SetFilenames(const std::vector<FileInfo>& filenames) override;
   void SetPickledData(const OSExchangeData::CustomFormat& format,
-                      const Pickle& data) override;
+                      const base::Pickle& data) override;
   bool GetString(base::string16* data) const override;
   bool GetURLAndTitle(OSExchangeData::FilenameToURLPolicy policy,
                       GURL* url,
@@ -42,7 +42,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderAura
   bool GetFilename(base::FilePath* path) const override;
   bool GetFilenames(std::vector<FileInfo>* filenames) const override;
   bool GetPickledData(const OSExchangeData::CustomFormat& format,
-                      Pickle* data) const override;
+                      base::Pickle* data) const override;
   bool HasString() const override;
   bool HasURL(OSExchangeData::FilenameToURLPolicy policy) const override;
   bool HasFile() const override;
@@ -58,7 +58,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderAura
   const gfx::Vector2d& GetDragImageOffset() const override;
 
  private:
-  typedef std::map<OSExchangeData::CustomFormat, Pickle>  PickleData;
+  typedef std::map<OSExchangeData::CustomFormat, base::Pickle> PickleData;
 
   // Returns true if |formats_| contains a string format and the string can be
   // parsed as a URL.
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
index 4d6a95f..959b6a6 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
@@ -69,7 +69,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderAuraX11
   void SetFilename(const base::FilePath& path) override;
   void SetFilenames(const std::vector<FileInfo>& filenames) override;
   void SetPickledData(const OSExchangeData::CustomFormat& format,
-                      const Pickle& pickle) override;
+                      const base::Pickle& pickle) override;
   bool GetString(base::string16* data) const override;
   bool GetURLAndTitle(OSExchangeData::FilenameToURLPolicy policy,
                       GURL* url,
@@ -77,7 +77,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderAuraX11
   bool GetFilename(base::FilePath* path) const override;
   bool GetFilenames(std::vector<FileInfo>* filenames) const override;
   bool GetPickledData(const OSExchangeData::CustomFormat& format,
-                      Pickle* pickle) const override;
+                      base::Pickle* pickle) const override;
   bool HasString() const override;
   bool HasURL(OSExchangeData::FilenameToURLPolicy policy) const override;
   bool HasFile() const override;
@@ -101,7 +101,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderAuraX11
 
  private:
   friend class OSExchangeDataProviderAuraX11Test;
-  typedef std::map<OSExchangeData::CustomFormat, Pickle>  PickleData;
+  typedef std::map<OSExchangeData::CustomFormat, base::Pickle> PickleData;
 
   // Returns true if |formats_| contains a string format and the string can be
   // parsed as a URL.
diff --git a/ui/base/dragdrop/os_exchange_data_provider_mac.h b/ui/base/dragdrop/os_exchange_data_provider_mac.h
index 3488c25..a22b3f2 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_mac.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_mac.h
@@ -29,7 +29,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderMac
   void SetFilename(const base::FilePath& path) override;
   void SetFilenames(const std::vector<FileInfo>& filenames) override;
   void SetPickledData(const OSExchangeData::CustomFormat& format,
-                      const Pickle& data) override;
+                      const base::Pickle& data) override;
   bool GetString(base::string16* data) const override;
   bool GetURLAndTitle(OSExchangeData::FilenameToURLPolicy policy,
                       GURL* url,
@@ -37,7 +37,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderMac
   bool GetFilename(base::FilePath* path) const override;
   bool GetFilenames(std::vector<FileInfo>* filenames) const override;
   bool GetPickledData(const OSExchangeData::CustomFormat& format,
-                      Pickle* data) const override;
+                      base::Pickle* data) const override;
   bool HasString() const override;
   bool HasURL(OSExchangeData::FilenameToURLPolicy policy) const override;
   bool HasFile() const override;
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.h b/ui/base/dragdrop/os_exchange_data_provider_win.h
index 59479ac..21304e5 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.h
@@ -152,7 +152,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderWin
   void SetFilename(const base::FilePath& path) override;
   void SetFilenames(const std::vector<FileInfo>& filenames) override;
   void SetPickledData(const OSExchangeData::CustomFormat& format,
-                      const Pickle& data) override;
+                      const base::Pickle& data) override;
   void SetFileContents(const base::FilePath& filename,
                        const std::string& file_contents) override;
   void SetHtml(const base::string16& html, const GURL& base_url) override;
@@ -164,7 +164,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderWin
   bool GetFilename(base::FilePath* path) const override;
   bool GetFilenames(std::vector<FileInfo>* filenames) const override;
   bool GetPickledData(const OSExchangeData::CustomFormat& format,
-                      Pickle* data) const override;
+                      base::Pickle* data) const override;
   bool GetFileContents(base::FilePath* filename,
                        std::string* file_contents) const override;
   bool GetHtml(base::string16* html, GURL* base_url) const override;