base: Convert scoped_arrays to the new scoped_ptr style.

base/pickle_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 <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
 #include "base/string16.h"
@@ skipping 83 matching lines @@
   VerifyResult(pickle2);
 
   // test operator=
   Pickle pickle3;
   pickle3 = pickle;
   VerifyResult(pickle3);
 }
 
 // Tests that we can handle really small buffers.
 TEST(PickleTest, SmallBuffer) {
-  scoped_array<char> buffer(new char[1]);
+  scoped_ptr<char[]> buffer(new char[1]);
 
   // We should not touch the buffer.
   Pickle pickle(buffer.get(), 1);
 
   PickleIterator iter(pickle);
   int data;
   EXPECT_FALSE(pickle.ReadInt(&iter, &data));
 }
 
 // Tests that we can handle improper headers.
@@ skipping 63 matching lines @@
   const char* start = reinterpret_cast<const char*>(pickle.data());
   const char* end = start + pickle.size();
 
   EXPECT_TRUE(end == Pickle::FindNext(pickle.header_size_, start, end));
   EXPECT_TRUE(NULL == Pickle::FindNext(pickle.header_size_, start, end - 1));
   EXPECT_TRUE(end == Pickle::FindNext(pickle.header_size_, start, end + 1));
 }
 
 TEST(PickleTest, FindNextWithIncompleteHeader) {
   size_t header_size = sizeof(Pickle::Header);
-  scoped_array<char> buffer(new char[header_size - 1]);
+  scoped_ptr<char[]> buffer(new char[header_size - 1]);
   memset(buffer.get(), 0x1, header_size - 1);
 
   const char* start = buffer.get();
   const char* end = start + header_size - 1;
 
   EXPECT_TRUE(NULL == Pickle::FindNext(header_size, start, end));
 }
 
 TEST(PickleTest, GetReadPointerAndAdvance) {
   Pickle pickle;
 
   PickleIterator iter(pickle);
   EXPECT_FALSE(iter.GetReadPointerAndAdvance(1));
 
   EXPECT_TRUE(pickle.WriteInt(1));
   EXPECT_TRUE(pickle.WriteInt(2));
   int bytes = sizeof(int) * 2;
 
   EXPECT_TRUE(PickleIterator(pickle).GetReadPointerAndAdvance(0));
   EXPECT_TRUE(PickleIterator(pickle).GetReadPointerAndAdvance(1));
   EXPECT_FALSE(PickleIterator(pickle).GetReadPointerAndAdvance(-1));
   EXPECT_TRUE(PickleIterator(pickle).GetReadPointerAndAdvance(bytes));
   EXPECT_FALSE(PickleIterator(pickle).GetReadPointerAndAdvance(bytes + 1));
   EXPECT_FALSE(PickleIterator(pickle).GetReadPointerAndAdvance(INT_MAX));
   EXPECT_FALSE(PickleIterator(pickle).GetReadPointerAndAdvance(INT_MIN));
 }
 
 TEST(PickleTest, Resize) {
   size_t unit = Pickle::kPayloadUnit;
-  scoped_array<char> data(new char[unit]);
+  scoped_ptr<char[]> data(new char[unit]);
   char* data_ptr = data.get();
   for (size_t i = 0; i < unit; i++)
     data_ptr[i] = 'G';
 
   // construct a message that will be exactly the size of one payload unit,
   // note that any data will have a 4-byte header indicating the size
   const size_t payload_size_after_header = unit - sizeof(uint32);
   Pickle pickle;
   pickle.WriteData(data_ptr,
       static_cast<int>(payload_size_after_header - sizeof(uint32)));
@@ skipping 104 matching lines @@
   EXPECT_TRUE(pickle.WriteBytes(&data, sizeof(data)));
 
   PickleIterator iter(pickle);
   const char* outdata_char = NULL;
   EXPECT_TRUE(pickle.ReadBytes(&iter, &outdata_char, sizeof(data)));
 
   int outdata;
   memcpy(&outdata, outdata_char, sizeof(outdata));
   EXPECT_EQ(data, outdata);
 }