Relax strict quota limit checks when reading pre-existing DomStorage database files. The other chec…

webkit/dom_storage/dom_storage_map_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 "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/dom_storage/dom_storage_map.h"
 
 namespace dom_storage {
 
@@ skipping 19 matching lines @@
   // Check the behavior of an empty map.
   EXPECT_EQ(0u, map->Length());
   EXPECT_TRUE(map->Key(0).is_null());
   EXPECT_TRUE(map->Key(100).is_null());
   EXPECT_TRUE(map->GetItem(kKey).is_null());
   EXPECT_FALSE(map->RemoveItem(kKey, &old_value));
   EXPECT_EQ(0u, map->bytes_used());
   copy = map->DeepCopy();
   EXPECT_EQ(0u, copy->Length());
   EXPECT_EQ(0u, copy->bytes_used());
-  EXPECT_TRUE(map->SwapValues(&swap));
+  map->SwapValues(&swap);
   EXPECT_TRUE(swap.empty());
 
   // Check the behavior of a map containing some values.
   EXPECT_TRUE(map->SetItem(kKey, kValue, &old_nullable_value));
   EXPECT_TRUE(old_nullable_value.is_null());
   EXPECT_EQ(1u, map->Length());
   EXPECT_EQ(kKey, map->Key(0).string());
   EXPECT_TRUE(map->Key(1).is_null());
   EXPECT_EQ(kValue, map->GetItem(kKey).string());
   EXPECT_TRUE(map->GetItem(kKey2).is_null());
@@ skipping 18 matching lines @@
 
   copy = map->DeepCopy();
   EXPECT_EQ(2u, copy->Length());
   EXPECT_EQ(kValue, copy->GetItem(kKey).string());
   EXPECT_EQ(kValue2, copy->GetItem(kKey2).string());
   EXPECT_EQ(kKey, copy->Key(0).string());
   EXPECT_EQ(kKey2, copy->Key(1).string());
   EXPECT_TRUE(copy->Key(2).is_null());
   EXPECT_EQ(kItemBytes + kItem2Bytes, copy->bytes_used());
 
-  EXPECT_TRUE(map->SwapValues(&swap));
+  map->SwapValues(&swap);
   EXPECT_EQ(2ul, swap.size());
   EXPECT_EQ(0u, map->Length());
   EXPECT_EQ(0u, map->bytes_used());
 }
 
 TEST(DomStorageMapTest, EnforcesQuota) {
   const string16 kKey = ASCIIToUTF16("test_key");
   const string16 kValue = ASCIIToUTF16("test_value");
   const string16 kKey2 = ASCIIToUTF16("test_key_2");
 
   // A 50 byte quota is too small to hold both keys, so we
   // should see the DomStorageMap enforcing it.
   const size_t kQuota = 50;
 
   string16 old_value;
   NullableString16 old_nullable_value;
 
   scoped_refptr<DomStorageMap> map(new DomStorageMap(kQuota));
   EXPECT_TRUE(map->SetItem(kKey, kValue, &old_nullable_value));
   EXPECT_FALSE(map->SetItem(kKey2, kValue, &old_nullable_value));
   EXPECT_EQ(1u, map->Length());
 
   EXPECT_TRUE(map->RemoveItem(kKey, &old_value));
   EXPECT_EQ(kValue, old_value);
   EXPECT_EQ(0u, map->Length());
   EXPECT_TRUE(map->SetItem(kKey2, kValue, &old_nullable_value));
   EXPECT_EQ(1u, map->Length());
 
   ValuesMap swap;
-  EXPECT_TRUE(map->SwapValues(&swap));
-  EXPECT_EQ(0u, map->Length());
-
-  swap[kKey] = NullableString16(kValue, false);
-  swap[kKey2] = NullableString16(kValue, false);
-
-  // swap is now too big to fit in the map, the swap should fail.
-  EXPECT_FALSE(map->SwapValues(&swap));
+  map->SwapValues(&swap);

[benm (inactive), 2012/03/06 11:31:15]

What is this bit of the test verifying now? I think we can remove it, or if you
add the code back and switch the expectation below with EXPECT_EQ(2u,
map->Length()) we could verify that swapping (i.e. grandfathering) will bypass
the quota check.

wdyt?

[michaeln, 2012/03/06 20:37:51]

Done, added tests to verify the quota checking behavior.

   EXPECT_EQ(0u, map->Length());
 }
 
 }  // namespace dom_storage