SessionStorageDatabase: Allow writing data into a shallow copy.

webkit/dom_storage/session_storage_database_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 "webkit/dom_storage/session_storage_database.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 461 matching lines @@
   CheckAreaData(1, kOrigin2, data2);
   CheckAreaData(5, kOrigin1, data1);
   CheckAreaData(5, kOrigin2, data2);
   // Both the namespaces refer to the same maps.
   EXPECT_EQ(GetMapForArea(1, kOrigin1), GetMapForArea(5, kOrigin1));
   EXPECT_EQ(GetMapForArea(1, kOrigin2), GetMapForArea(5, kOrigin2));
   EXPECT_EQ(2, GetMapRefCount(GetMapForArea(1, kOrigin1)));
   EXPECT_EQ(2, GetMapRefCount(GetMapForArea(1, kOrigin2)));
 }
 
-TEST_F(SessionStorageDatabaseTest, DeepCopy) {
+TEST_F(SessionStorageDatabaseTest, WriteIntoShallowCopy) {
   ValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data1));
   EXPECT_TRUE(db_->CloneNamespace(1, 5));
 
-  // Make the shallow copy deep.
-  EXPECT_TRUE(db_->DeepCopyArea(5, kOrigin1));
-
-  // Write data into the deep copy.
+  // Write data into a shallow copy.
   ValuesMap changes;
   ValuesMap reference;
   changes[kKey1] = kValueNull;
   changes[kKey2] = kValue4;
   changes[kKey3] = kValue4;
   reference[kKey2] = kValue4;
   reference[kKey3] = kValue4;
   EXPECT_TRUE(db_->CommitAreaChanges(5, kOrigin1, false, changes));
 
   // Values in the original namespace were not changed.
   CheckAreaData(1, kOrigin1, data1);
-  // But values in the deep copy were.
+  // But values in the copy were.
   CheckAreaData(5, kOrigin1, reference);
 
   // The namespaces no longer refer to the same map.
   EXPECT_NE(GetMapForArea(1, kOrigin1), GetMapForArea(5, kOrigin1));
   EXPECT_EQ(1, GetMapRefCount(GetMapForArea(1, kOrigin1)));
   EXPECT_EQ(1, GetMapRefCount(GetMapForArea(5, kOrigin1)));
 }
 
 TEST_F(SessionStorageDatabaseTest, ManyShallowCopies) {
   // Write data for a namespace, for 2 origins.
@@ skipping 243 matching lines @@
 
   // Close the database and recreate it.
   ResetDatabase();
 
   // The namespace and the clone are still accessible.
   CheckAreaData(-1, kOrigin1, data2);
   CheckAreaData(-20, kOrigin1, data2);
   CheckAreaData(-22, kOrigin1, data1);
 }
 
-TEST_F(SessionStorageDatabaseTest, NamespaceOffsetDeepCopyArea) {
+TEST_F(SessionStorageDatabaseTest, NamespaceOffsetWriteIntoShallowCopy) {
   // Create a namespace with id 1.
   ValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   ASSERT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data1));
 
   // Close the database and recreate it.
   ResetDatabase();
 
   // Create another namespace with id 1.
   ValuesMap data2;
   data2[kKey1] = kValue3;
   EXPECT_TRUE(db_->CommitAreaChanges(1, kOrigin1, false, data2));
 
   // Make a shallow copy of the newly created namespace.
   EXPECT_TRUE(db_->CloneNamespace(1, 20));
-  // And make it deep.
-  EXPECT_TRUE(db_->DeepCopyArea(20, kOrigin1));
 
-  // Now the values can be altered in the deep copy.
+  // Now the values can be altered and a deep copy will be made.
   ValuesMap data3;
   data3[kKey1] = kValue2;
   EXPECT_TRUE(db_->CommitAreaChanges(20, kOrigin1, false, data3));
 
   CheckAreaData(20, kOrigin1, data3);
   CheckAreaData(1, kOrigin1, data2);
 
   // The values for the old namespace 1 are still accessible via id -1.
   CheckAreaData(-1, kOrigin1, data1);
 
@@ skipping 50 matching lines @@
   EXPECT_TRUE(db_->DeleteNamespace(1));
 
   // Namespace 1 is empty.
   CheckAreaData(1, kOrigin1, ValuesMap());
 
   // The values for the old namespace 1 are still accessible via id -1.
   CheckAreaData(-1, kOrigin1, data1);
 }
 
 }  // namespace dom_storage