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

webkit/dom_storage/dom_storage_map_unittest.cc

Index: webkit/dom_storage/dom_storage_map_unittest.cc
===================================================================
--- webkit/dom_storage/dom_storage_map_unittest.cc	(revision 124748)
+++ webkit/dom_storage/dom_storage_map_unittest.cc	(working copy)
@@ -37,7 +37,7 @@
   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.
@@ -76,7 +76,7 @@
   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());
@@ -106,15 +106,8 @@
   EXPECT_EQ(1u, map->Length());
 
   ValuesMap swap;
-  EXPECT_TRUE(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());
-
-  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));
-  EXPECT_EQ(0u, map->Length());
 }
 
 }  // namespace dom_storage