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}

1 files changed, 6 insertions, 4 deletions

diff --git a/ppapi/proxy/serialized_flash_menu.cc b/ppapi/proxy/serialized_flash_menu.cc
index 9f39916..cda9545 100644
--- a/ppapi/proxy/serialized_flash_menu.cc
+++ b/ppapi/proxy/serialized_flash_menu.cc
@@ -20,7 +20,9 @@ const uint32_t kMaxMenuEntries = 1000;
 bool CheckMenu(int depth, const PP_Flash_Menu* menu);
 void FreeMenu(const PP_Flash_Menu* menu);
 void WriteMenu(IPC::Message* m, const PP_Flash_Menu* menu);
-PP_Flash_Menu* ReadMenu(int depth, const IPC::Message* m, PickleIterator* iter);
+PP_Flash_Menu* ReadMenu(int depth,
+                        const IPC::Message* m,
+                        base::PickleIterator* iter);
 
 bool CheckMenuItem(int depth, const PP_Flash_MenuItem* item) {
   if (item->type == PP_FLASH_MENUITEM_TYPE_SUBMENU)
@@ -78,7 +80,7 @@ void FreeMenu(const PP_Flash_Menu* menu) {
 
 bool ReadMenuItem(int depth,
                   const IPC::Message* m,
-                  PickleIterator* iter,
+                  base::PickleIterator* iter,
                   PP_Flash_MenuItem* menu_item) {
   uint32_t type;
   if (!iter->ReadUInt32(&type))
@@ -108,7 +110,7 @@ bool ReadMenuItem(int depth,
 
 PP_Flash_Menu* ReadMenu(int depth,
                         const IPC::Message* m,
-                        PickleIterator* iter) {
+                        base::PickleIterator* iter) {
   if (depth > kMaxMenuDepth)
     return NULL;
   ++depth;
@@ -167,7 +169,7 @@ void SerializedFlashMenu::WriteToMessage(IPC::Message* m) const {
 }
 
 bool SerializedFlashMenu::ReadFromMessage(const IPC::Message* m,
-                                          PickleIterator* iter) {
+                                          base::PickleIterator* iter) {
   DCHECK(!pp_menu_);
   pp_menu_ = ReadMenu(0, m, iter);
   if (!pp_menu_)