Move Pickle to base namespace.

ppapi/proxy/resource_message_params.h

 // 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.
 
 #ifndef PPAPI_PROXY_RESOURCE_MESSAGE_PARAMS_H_
 #define PPAPI_PROXY_RESOURCE_MESSAGE_PARAMS_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 55 matching lines @@
 
   // Appends the given handle to the list of handles sent with the call or
   // reply.
   void AppendHandle(const SerializedHandle& handle) const;
 
  protected:
   ResourceMessageParams();
   ResourceMessageParams(PP_Resource resource, int32_t sequence);
 
   virtual void Serialize(IPC::Message* msg) const;
-  virtual bool Deserialize(const IPC::Message* msg, PickleIterator* iter);
+  virtual bool Deserialize(const IPC::Message* msg, base::PickleIterator* iter);
 
   // Writes everything except the handles to |msg|.
   void WriteHeader(IPC::Message* msg) const;
   // Writes the handles to |msg|.
   void WriteHandles(IPC::Message* msg) const;
   // Matching deserialize helpers.
-  bool ReadHeader(const IPC::Message* msg, PickleIterator* iter);
-  bool ReadHandles(const IPC::Message* msg, PickleIterator* iter);
+  bool ReadHeader(const IPC::Message* msg, base::PickleIterator* iter);
+  bool ReadHandles(const IPC::Message* msg, base::PickleIterator* iter);
 
  private:
   class PPAPI_PROXY_EXPORT SerializedHandles
       : public base::RefCountedThreadSafe<SerializedHandles> {
    public:
     SerializedHandles();
     ~SerializedHandles();
 
     void set_should_close(bool value) { should_close_ = value; }
     std::vector<SerializedHandle>& data() { return data_; }
@@ skipping 43 matching lines @@
     : public ResourceMessageParams {
  public:
   ResourceMessageCallParams();
   ResourceMessageCallParams(PP_Resource resource, int32_t sequence);
   ~ResourceMessageCallParams() override;
 
   void set_has_callback() { has_callback_ = true; }
   bool has_callback() const { return has_callback_; }
 
   void Serialize(IPC::Message* msg) const override;
-  bool Deserialize(const IPC::Message* msg, PickleIterator* iter) override;
+  bool Deserialize(const IPC::Message* msg,
+                   base::PickleIterator* iter) override;
 
  private:
   bool has_callback_;
 };
 
 // Parameters common to all ResourceMessage "Reply" requests.
 class PPAPI_PROXY_EXPORT ResourceMessageReplyParams
     : public ResourceMessageParams {
  public:
   ResourceMessageReplyParams();
   ResourceMessageReplyParams(PP_Resource resource, int32_t sequence);
   ~ResourceMessageReplyParams() override;
 
   void set_result(int32_t r) { result_ = r; }
   int32_t result() const { return result_; }
 
   void Serialize(IPC::Message* msg) const override;
-  bool Deserialize(const IPC::Message* msg, PickleIterator* iter) override;
+  bool Deserialize(const IPC::Message* msg,
+                   base::PickleIterator* iter) override;
 
   // Writes everything except the handles to |msg|.
   void WriteReplyHeader(IPC::Message* msg) const;
 
  private:
   // Pepper "result code" for the callback.
   int32_t result_;
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 namespace IPC {
 
 template <> struct PPAPI_PROXY_EXPORT
 ParamTraits<ppapi::proxy::ResourceMessageCallParams> {
   typedef ppapi::proxy::ResourceMessageCallParams param_type;
   static void Write(Message* m, const param_type& p) {
     p.Serialize(m);
   }
-  static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
+  static bool Read(const Message* m, base::PickleIterator* iter,
+                   param_type* r) {
     return r->Deserialize(m, iter);
   }
   static void Log(const param_type& p, std::string* l) {
   }
 };
 
 template <> struct PPAPI_PROXY_EXPORT
 ParamTraits<ppapi::proxy::ResourceMessageReplyParams> {
   typedef ppapi::proxy::ResourceMessageReplyParams param_type;
   static void Write(Message* m, const param_type& p) {
     p.Serialize(m);
   }
-  static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
+  static bool Read(const Message* m, base::PickleIterator* iter,
+                   param_type* r) {
     return r->Deserialize(m, iter);
   }
   static void Log(const param_type& p, std::string* l) {
   }
 };
 
 }  // namespace IPC
 
 #endif  // PPAPI_PROXY_RESOURCE_MESSAGE_PARAMS_H_