Change Pickle to double its capacity by default, rather than increasing...

base/pickle_unittest.cc

 // Copyright (c) 2006-2008 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/pickle.h"
 #include "base/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 149 matching lines @@
     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)));
   size_t cur_payload = payload_size_after_header;
 
-  EXPECT_EQ(pickle.capacity(), unit);
+  // note: we assume 'unit' is a power of 2
+  EXPECT_EQ(unit, pickle.capacity());
   EXPECT_EQ(pickle.payload_size(), payload_size_after_header);
 
   // fill out a full page (noting data header)
   pickle.WriteData(data_ptr, static_cast<int>(unit - sizeof(uint32)));
   cur_payload += unit;
   EXPECT_EQ(unit * 2, pickle.capacity());
   EXPECT_EQ(cur_payload, pickle.payload_size());
 
-  // one more byte should expand the capacity by one unit
+  // one more byte should double the capacity
   pickle.WriteData(data_ptr, 1);
   cur_payload += 5;
-  EXPECT_EQ(unit * 3, pickle.capacity());
+  EXPECT_EQ(unit * 4, pickle.capacity());
   EXPECT_EQ(cur_payload, pickle.payload_size());
 }
 
 namespace {
 
 struct CustomHeader : Pickle::Header {
   int blah;
 };
 
 }  // namespace
@@ skipping 17 matching lines @@
 TEST(PickleTest, EqualsOperator) {
   Pickle source;
   source.WriteInt(1);
 
   Pickle copy_refs_source_buffer(static_cast<const char*>(source.data()),
                                  source.size());
   Pickle copy;
   copy = copy_refs_source_buffer;
   ASSERT_EQ(source.size(), copy.size());
 }