IPC::Message -> base::Pickle

gpu/ipc/gpu_command_buffer_traits.cc

Index: gpu/ipc/gpu_command_buffer_traits.cc
diff --git a/gpu/ipc/gpu_command_buffer_traits.cc b/gpu/ipc/gpu_command_buffer_traits.cc
index 758077427cdf0dbc621dab5886e31c7cb5795ceb..eecc1374b215d2bdd483c42e0fb41cfb7b2f81d6 100644
--- a/gpu/ipc/gpu_command_buffer_traits.cc
+++ b/gpu/ipc/gpu_command_buffer_traits.cc
@@ -31,17 +31,17 @@ namespace IPC {
 
 namespace IPC {
 
-void ParamTraits<gpu::CommandBuffer::State> ::Write(Message* m,
-                                                    const param_type& p) {
+void ParamTraits<gpu::CommandBuffer::State>::Write(base::Pickle* m,
+                                                   const param_type& p) {
   WriteParam(m, p.get_offset);
   WriteParam(m, p.token);
   WriteParam(m, p.error);
   WriteParam(m, p.generation);
 }
 
-bool ParamTraits<gpu::CommandBuffer::State> ::Read(const Message* m,
-                                                   base::PickleIterator* iter,
-                                                   param_type* p) {
+bool ParamTraits<gpu::CommandBuffer::State>::Read(const base::Pickle* m,
+                                                  base::PickleIterator* iter,
+                                                  param_type* p) {
   if (ReadParam(m, iter, &p->get_offset) &&
       ReadParam(m, iter, &p->token) &&
       ReadParam(m, iter, &p->error) &&
@@ -57,7 +57,7 @@ void ParamTraits<gpu::CommandBuffer::State> ::Log(const param_type& p,
   l->append("<CommandBuffer::State>");
 }
 
-void ParamTraits<gpu::SyncToken>::Write(Message* m, const param_type& p) {
+void ParamTraits<gpu::SyncToken>::Write(base::Pickle* m, const param_type& p) {
   DCHECK(!p.HasData() || p.verified_flush());
 
   WriteParam(m, p.verified_flush());
@@ -66,7 +66,7 @@ void ParamTraits<gpu::SyncToken>::Write(Message* m, const param_type& p) {
   WriteParam(m, p.release_count());
 }
 
-bool ParamTraits<gpu::SyncToken>::Read(const Message* m,
+bool ParamTraits<gpu::SyncToken>::Read(const base::Pickle* m,
                                        base::PickleIterator* iter,
                                        param_type* p) {
   bool verified_flush = false;
@@ -99,13 +99,13 @@ void ParamTraits<gpu::SyncToken>::Log(const param_type& p, std::string* l) {
                          static_cast<unsigned long long>(p.release_count()));
 }
 
-void ParamTraits<gpu::Mailbox>::Write(Message* m, const param_type& p) {
+void ParamTraits<gpu::Mailbox>::Write(base::Pickle* m, const param_type& p) {
   m->WriteBytes(p.name, sizeof(p.name));
 }
 
-bool ParamTraits<gpu::Mailbox> ::Read(const Message* m,
-                                      base::PickleIterator* iter,
-                                      param_type* p) {
+bool ParamTraits<gpu::Mailbox>::Read(const base::Pickle* m,
+                                     base::PickleIterator* iter,
+                                     param_type* p) {
   const char* bytes = NULL;
   if (!iter->ReadBytes(&bytes, sizeof(p->name)))
     return false;
@@ -119,15 +119,16 @@ void ParamTraits<gpu::Mailbox>::Log(const param_type& p, std::string* l) {
     *l += base::StringPrintf("%02x", p.name[i]);
 }
 
-void ParamTraits<gpu::MailboxHolder>::Write(Message* m, const param_type& p) {
+void ParamTraits<gpu::MailboxHolder>::Write(base::Pickle* m,
+                                            const param_type& p) {
   WriteParam(m, p.mailbox);
   WriteParam(m, p.sync_token);
   WriteParam(m, p.texture_target);
 }
 
-bool ParamTraits<gpu::MailboxHolder> ::Read(const Message* m,
-                                            base::PickleIterator* iter,
-                                            param_type* p) {
+bool ParamTraits<gpu::MailboxHolder>::Read(const base::Pickle* m,
+                                           base::PickleIterator* iter,
+                                           param_type* p) {
   if (!ReadParam(m, iter, &p->mailbox) || !ReadParam(m, iter, &p->sync_token) ||
       !ReadParam(m, iter, &p->texture_target))
     return false;
@@ -140,14 +141,14 @@ void ParamTraits<gpu::MailboxHolder>::Log(const param_type& p, std::string* l) {
   *l += base::StringPrintf(":%04x@", p.texture_target);
 }
 
-void ParamTraits<gpu::ValueState>::Write(Message* m, const param_type& p) {
+void ParamTraits<gpu::ValueState>::Write(base::Pickle* m, const param_type& p) {
   m->WriteData(reinterpret_cast<const char*>(&p),
                sizeof(gpu::ValueState));
 }
 
-bool ParamTraits<gpu::ValueState> ::Read(const Message* m,
-                                         base::PickleIterator* iter,
-                                         param_type* p) {
+bool ParamTraits<gpu::ValueState>::Read(const base::Pickle* m,
+                                        base::PickleIterator* iter,
+                                        param_type* p) {
   int length;
   const char* data = NULL;
   if (!iter->ReadData(&data, &length) || length != sizeof(gpu::ValueState))