Change most uses of Pickle to base::Pickle

content/common/cc_messages_unittest.cc

 // 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.
 
 #include "content/common/cc_messages.h"
 
 #include <string.h>
 
 #include <algorithm>
 
@@ skipping 477 matching lines @@
     EXPECT_EQ(same_shared_quad_state_cmp, same_shared_quad_state_in);
   }
 
   DelegatedFrameData frame_in;
   frame_in.render_pass_list.push_back(child_pass_in.Pass());
   frame_in.render_pass_list.push_back(pass_in.Pass());
 
   IPC::ParamTraits<DelegatedFrameData>::Write(&msg, frame_in);
 
   DelegatedFrameData frame_out;
-  PickleIterator iter(msg);
+  base::PickleIterator iter(msg);
   EXPECT_TRUE(IPC::ParamTraits<DelegatedFrameData>::Read(&msg,
       &iter, &frame_out));
 
   // Make sure the out and cmp RenderPasses match.
   scoped_ptr<RenderPass> child_pass_out =
       frame_out.render_pass_list.take(frame_out.render_pass_list.begin());
   Compare(child_pass_cmp.get(), child_pass_out.get());
   ASSERT_EQ(0u, child_pass_out->shared_quad_state_list.size());
   ASSERT_EQ(0u, child_pass_out->quad_list.size());
   scoped_ptr<RenderPass> pass_out =
@@ skipping 101 matching lines @@
   ASSERT_EQ(5u, pass_in->shared_quad_state_list.size());
   ASSERT_EQ(2u, pass_in->quad_list.size());
 
   DelegatedFrameData frame_in;
   frame_in.render_pass_list.push_back(pass_in.Pass());
 
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   IPC::ParamTraits<DelegatedFrameData>::Write(&msg, frame_in);
 
   DelegatedFrameData frame_out;
-  PickleIterator iter(msg);
+  base::PickleIterator iter(msg);
   EXPECT_TRUE(
       IPC::ParamTraits<DelegatedFrameData>::Read(&msg, &iter, &frame_out));
 
   scoped_ptr<RenderPass> pass_out =
       frame_out.render_pass_list.take(frame_out.render_pass_list.begin());
 
   // 2 SharedQuadStates come out. The first and fourth SharedQuadStates were
   // used by quads, and so serialized. Others were not.
   ASSERT_EQ(2u, pass_out->shared_quad_state_list.size());
   ASSERT_EQ(2u, pass_out->quad_list.size());
@@ skipping 47 matching lines @@
       RenderPassId(1, 1), gfx::Rect(), gfx::Rect(), gfx::Transform());
 
   DelegatedFrameData frame_in;
   frame_in.resource_list.push_back(arbitrary_resource1);
   frame_in.resource_list.push_back(arbitrary_resource2);
   frame_in.render_pass_list.push_back(renderpass_in.Pass());
 
   IPC::ParamTraits<DelegatedFrameData>::Write(&msg, frame_in);
 
   DelegatedFrameData frame_out;
-  PickleIterator iter(msg);
+  base::PickleIterator iter(msg);
   EXPECT_TRUE(IPC::ParamTraits<DelegatedFrameData>::Read(&msg,
       &iter, &frame_out));
 
   ASSERT_EQ(2u, frame_out.resource_list.size());
   Compare(arbitrary_resource1, frame_out.resource_list[0]);
   Compare(arbitrary_resource2, frame_out.resource_list[1]);
 }
 
 TEST_F(CCMessagesTest, SoftwareFrameData) {
   cc::SoftwareFrameData frame_in;
   frame_in.id = 3;
   frame_in.size = gfx::Size(40, 20);
   frame_in.damage_rect = gfx::Rect(5, 18, 31, 44);
   frame_in.bitmap_id = cc::SharedBitmap::GenerateId();
 
   // Write the frame.
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   IPC::ParamTraits<cc::SoftwareFrameData>::Write(&msg, frame_in);
 
   // Read the frame.
   cc::SoftwareFrameData frame_out;
-  PickleIterator iter(msg);
+  base::PickleIterator iter(msg);
   EXPECT_TRUE(
       IPC::ParamTraits<SoftwareFrameData>::Read(&msg, &iter, &frame_out));
   EXPECT_EQ(frame_in.id, frame_out.id);
   EXPECT_EQ(frame_in.size.ToString(), frame_out.size.ToString());
   EXPECT_EQ(frame_in.damage_rect.ToString(), frame_out.damage_rect.ToString());
   EXPECT_EQ(frame_in.bitmap_id, frame_out.bitmap_id);
 }
 
 TEST_F(CCMessagesTest, SoftwareFrameDataMaxInt) {
   SoftwareFrameData frame_in;
   frame_in.id = 3;
   frame_in.size = gfx::Size(40, 20);
   frame_in.damage_rect = gfx::Rect(5, 18, 31, 44);
   frame_in.bitmap_id = cc::SharedBitmap::GenerateId();
 
   // Write the SoftwareFrameData by hand, make sure it works.
   {
     IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
     IPC::WriteParam(&msg, frame_in.id);
     IPC::WriteParam(&msg, frame_in.size);
     IPC::WriteParam(&msg, frame_in.damage_rect);
     IPC::WriteParam(&msg, frame_in.bitmap_id);
     SoftwareFrameData frame_out;
-    PickleIterator iter(msg);
+    base::PickleIterator iter(msg);
     EXPECT_TRUE(
         IPC::ParamTraits<SoftwareFrameData>::Read(&msg, &iter, &frame_out));
   }
 
   // The size of the frame may overflow when multiplied together.
   int max = std::numeric_limits<int>::max();
   frame_in.size = gfx::Size(max, max);
 
   // If size_t is larger than int, then int*int*4 can always fit in size_t.
   bool expect_read = sizeof(size_t) >= sizeof(int) * 2;
 
   // Write the SoftwareFrameData with the MaxInt size, if it causes overflow it
   // should fail.
   {
     IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
     IPC::WriteParam(&msg, frame_in.id);
     IPC::WriteParam(&msg, frame_in.size);
     IPC::WriteParam(&msg, frame_in.damage_rect);
     IPC::WriteParam(&msg, frame_in.bitmap_id);
     SoftwareFrameData frame_out;
-    PickleIterator iter(msg);
+    base::PickleIterator iter(msg);
     EXPECT_EQ(
         expect_read,
         IPC::ParamTraits<SoftwareFrameData>::Read(&msg, &iter, &frame_out));
   }
 }
 
 }  // namespace
 }  // namespace content