Move webkit/{browser,common}/dom_storage into content/

content/browser/dom_storage/session_storage_database_unittest.cc

Index: content/browser/dom_storage/session_storage_database_unittest.cc
diff --git a/webkit/browser/dom_storage/session_storage_database_unittest.cc b/content/browser/dom_storage/session_storage_database_unittest.cc
similarity index 93%
rename from webkit/browser/dom_storage/session_storage_database_unittest.cc
rename to content/browser/dom_storage/session_storage_database_unittest.cc
index 127b183c8804e5ff329dfedc8606c9c1e1005405..7193de0fc1f73374cbaf34bfac24be8f21b00ac6 100644
--- a/webkit/browser/dom_storage/session_storage_database_unittest.cc
+++ b/content/browser/dom_storage/session_storage_database_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 
-#include "webkit/browser/dom_storage/session_storage_database.h"
+#include "content/browser/dom_storage/session_storage_database.h"
 
 #include <algorithm>
 #include <map>
@@ -14,14 +14,14 @@
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/common/dom_storage/dom_storage_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/iterator.h"
 #include "third_party/leveldatabase/src/include/leveldb/options.h"
 #include "url/gurl.h"
-#include "webkit/common/dom_storage/dom_storage_types.h"
 
-namespace dom_storage {
+namespace content {
 
 class SessionStorageDatabaseTest : public testing::Test {
  public:
@@ -48,8 +48,9 @@ class SessionStorageDatabaseTest : public testing::Test {
   void DumpData() const;
   void CheckAreaData(const std::string& namespace_id,
                      const GURL& origin,
-                     const ValuesMap& reference) const;
-  void CompareValuesMaps(const ValuesMap& map1, const ValuesMap& map2) const;
+                     const DOMStorageValuesMap& reference) const;
+  void CompareValuesMaps(const DOMStorageValuesMap& map1,
+                         const DOMStorageValuesMap& map2) const;
   void CheckNamespaceIds(
       const std::set<std::string>& expected_namespace_ids) const;
   void CheckOrigins(
@@ -316,17 +317,18 @@ void SessionStorageDatabaseTest::DumpData() const {
 
 void SessionStorageDatabaseTest::CheckAreaData(
     const std::string& namespace_id, const GURL& origin,
-    const ValuesMap& reference) const {
-  ValuesMap values;
+    const DOMStorageValuesMap& reference) const {
+  DOMStorageValuesMap values;
   db_->ReadAreaValues(namespace_id, origin, &values);
   CompareValuesMaps(values, reference);
 }
 
 void SessionStorageDatabaseTest::CompareValuesMaps(
-    const ValuesMap& map1,
-    const ValuesMap& map2) const {
+    const DOMStorageValuesMap& map1,
+    const DOMStorageValuesMap& map2) const {
   ASSERT_EQ(map2.size(), map1.size());
-  for (ValuesMap::const_iterator it = map1.begin(); it != map1.end(); ++it) {
+  for (DOMStorageValuesMap::const_iterator it = map1.begin();
+       it != map1.end(); ++it) {
     base::string16 key = it->first;
     ASSERT_TRUE(map2.find(key) != map2.end());
     base::NullableString16 val1 = it->second;
@@ -386,10 +388,10 @@ TEST_F(SessionStorageDatabaseTest, EmptyDatabaseSanityCheck) {
 
 TEST_F(SessionStorageDatabaseTest, WriteDataForOneOrigin) {
   // Keep track on what the values should look like.
-  ValuesMap reference;
+  DOMStorageValuesMap reference;
   // Write data.
   {
-    ValuesMap changes;
+    DOMStorageValuesMap changes;
     changes[kKey1] = kValue1;
     changes[kKey2] = kValue2;
     changes[kKey3] = kValue3;
@@ -403,7 +405,7 @@ TEST_F(SessionStorageDatabaseTest, WriteDataForOneOrigin) {
 
   // Overwrite and delete values.
   {
-    ValuesMap changes;
+    DOMStorageValuesMap changes;
     changes[kKey1] = kValue4;
     changes[kKey3] = kValueNull;
     reference[kKey1] = kValue4;
@@ -415,7 +417,7 @@ TEST_F(SessionStorageDatabaseTest, WriteDataForOneOrigin) {
 
   // Clear data before writing.
   {
-    ValuesMap changes;
+    DOMStorageValuesMap changes;
     changes[kKey2] = kValue2;
     reference.erase(kKey1);
     reference[kKey2] = kValue2;
@@ -427,13 +429,13 @@ TEST_F(SessionStorageDatabaseTest, WriteDataForOneOrigin) {
 
 TEST_F(SessionStorageDatabaseTest, WriteDataForTwoOrigins) {
   // Write data.
-  ValuesMap data1;
+  DOMStorageValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   data1[kKey3] = kValue3;
   EXPECT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin1, false, data1));
 
-  ValuesMap data2;
+  DOMStorageValuesMap data2;
   data2[kKey1] = kValue4;
   data2[kKey2] = kValue1;
   data2[kKey3] = kValue2;
@@ -446,20 +448,20 @@ TEST_F(SessionStorageDatabaseTest, WriteDataForTwoOrigins) {
 
 TEST_F(SessionStorageDatabaseTest, WriteDataForTwoNamespaces) {
   // Write data.
-  ValuesMap data11;
+  DOMStorageValuesMap data11;
   data11[kKey1] = kValue1;
   data11[kKey2] = kValue2;
   data11[kKey3] = kValue3;
   EXPECT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin1, false, data11));
-  ValuesMap data12;
+  DOMStorageValuesMap data12;
   data12[kKey2] = kValue4;
   data12[kKey3] = kValue3;
   EXPECT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin2, false, data12));
-  ValuesMap data21;
+  DOMStorageValuesMap data21;
   data21[kKey1] = kValue2;
   data21[kKey2] = kValue4;
   EXPECT_TRUE(db_->CommitAreaChanges(kNamespace2, kOrigin1, false, data21));
-  ValuesMap data22;
+  DOMStorageValuesMap data22;
   data22[kKey2] = kValue1;
   data22[kKey3] = kValue2;
   EXPECT_TRUE(db_->CommitAreaChanges(kNamespace2, kOrigin2, false, data22));
@@ -472,12 +474,12 @@ TEST_F(SessionStorageDatabaseTest, WriteDataForTwoNamespaces) {
 
 TEST_F(SessionStorageDatabaseTest, ShallowCopy) {
   // Write data for a namespace, for 2 origins.
-  ValuesMap data1;
+  DOMStorageValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   data1[kKey3] = kValue3;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin1, false, data1));
-  ValuesMap data2;
+  DOMStorageValuesMap data2;
   data2[kKey1] = kValue2;
   data2[kKey3] = kValue1;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin2, false, data2));
@@ -499,15 +501,15 @@ TEST_F(SessionStorageDatabaseTest, ShallowCopy) {
 }
 
 TEST_F(SessionStorageDatabaseTest, WriteIntoShallowCopy) {
-  ValuesMap data1;
+  DOMStorageValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin1, false, data1));
   EXPECT_TRUE(db_->CloneNamespace(kNamespace1, kNamespaceClone));
 
   // Write data into a shallow copy.
-  ValuesMap changes;
-  ValuesMap reference;
+  DOMStorageValuesMap changes;
+  DOMStorageValuesMap reference;
   changes[kKey1] = kValueNull;
   changes[kKey2] = kValue4;
   changes[kKey3] = kValue4;
@@ -530,12 +532,12 @@ TEST_F(SessionStorageDatabaseTest, WriteIntoShallowCopy) {
 
 TEST_F(SessionStorageDatabaseTest, ManyShallowCopies) {
   // Write data for a namespace, for 2 origins.
-  ValuesMap data1;
+  DOMStorageValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   data1[kKey3] = kValue3;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin1, false, data1));
-  ValuesMap data2;
+  DOMStorageValuesMap data2;
   data2[kKey1] = kValue2;
   data2[kKey3] = kValue1;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin2, false, data2));
@@ -580,7 +582,7 @@ TEST_F(SessionStorageDatabaseTest, ManyShallowCopies) {
 }
 
 TEST_F(SessionStorageDatabaseTest, DisassociateShallowCopy) {
-  ValuesMap data1;
+  DOMStorageValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin1, false, data1));
@@ -591,8 +593,8 @@ TEST_F(SessionStorageDatabaseTest, DisassociateShallowCopy) {
   CheckDatabaseConsistency();
 
   // Now new data can be written to that map.
-  ValuesMap reference;
-  ValuesMap changes;
+  DOMStorageValuesMap reference;
+  DOMStorageValuesMap changes;
   changes[kKey1] = kValueNull;
   changes[kKey2] = kValue4;
   changes[kKey3] = kValue4;
@@ -609,12 +611,12 @@ TEST_F(SessionStorageDatabaseTest, DisassociateShallowCopy) {
 }
 
 TEST_F(SessionStorageDatabaseTest, DeleteNamespace) {
-  ValuesMap data1;
+  DOMStorageValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   data1[kKey3] = kValue3;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin1, false, data1));
-  ValuesMap data2;
+  DOMStorageValuesMap data2;
   data2[kKey2] = kValue4;
   data2[kKey3] = kValue3;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin2, false, data2));
@@ -625,12 +627,12 @@ TEST_F(SessionStorageDatabaseTest, DeleteNamespace) {
 
 TEST_F(SessionStorageDatabaseTest, DeleteNamespaceWithShallowCopy) {
   // Write data for a namespace, for 2 origins.
-  ValuesMap data1;
+  DOMStorageValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   data1[kKey3] = kValue3;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin1, false, data1));
-  ValuesMap data2;
+  DOMStorageValuesMap data2;
   data2[kKey1] = kValue2;
   data2[kKey3] = kValue1;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin2, false, data2));
@@ -641,8 +643,8 @@ TEST_F(SessionStorageDatabaseTest, DeleteNamespaceWithShallowCopy) {
 
   // The original namespace has no data.
   CheckDatabaseConsistency();
-  CheckAreaData(kNamespace1, kOrigin1, ValuesMap());
-  CheckAreaData(kNamespace1, kOrigin2, ValuesMap());
+  CheckAreaData(kNamespace1, kOrigin1, DOMStorageValuesMap());
+  CheckAreaData(kNamespace1, kOrigin2, DOMStorageValuesMap());
   // But the copy persists.
   CheckAreaData(kNamespaceClone, kOrigin1, data1);
   CheckAreaData(kNamespaceClone, kOrigin2, data2);
@@ -650,12 +652,12 @@ TEST_F(SessionStorageDatabaseTest, DeleteNamespaceWithShallowCopy) {
 
 TEST_F(SessionStorageDatabaseTest, DeleteArea) {
   // Write data for a namespace, for 2 origins.
-  ValuesMap data1;
+  DOMStorageValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   data1[kKey3] = kValue3;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin1, false, data1));
-  ValuesMap data2;
+  DOMStorageValuesMap data2;
   data2[kKey1] = kValue2;
   data2[kKey3] = kValue1;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin2, false, data2));
@@ -665,17 +667,17 @@ TEST_F(SessionStorageDatabaseTest, DeleteArea) {
   // The data for the non-deleted origin persists.
   CheckAreaData(kNamespace1, kOrigin1, data1);
   // The data for the deleted origin is gone.
-  CheckAreaData(kNamespace1, kOrigin2, ValuesMap());
+  CheckAreaData(kNamespace1, kOrigin2, DOMStorageValuesMap());
 }
 
 TEST_F(SessionStorageDatabaseTest, DeleteAreaWithShallowCopy) {
   // Write data for a namespace, for 2 origins.
-  ValuesMap data1;
+  DOMStorageValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   data1[kKey3] = kValue3;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin1, false, data1));
-  ValuesMap data2;
+  DOMStorageValuesMap data2;
   data2[kKey1] = kValue2;
   data2[kKey3] = kValue1;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin2, false, data2));
@@ -686,7 +688,7 @@ TEST_F(SessionStorageDatabaseTest, DeleteAreaWithShallowCopy) {
   CheckDatabaseConsistency();
 
   // The original namespace has data for only the non-deleted origin.
-  CheckAreaData(kNamespace1, kOrigin1, ValuesMap());
+  CheckAreaData(kNamespace1, kOrigin1, DOMStorageValuesMap());
   CheckAreaData(kNamespace1, kOrigin2, data2);
   // But the copy persists.
   CheckAreaData(kNamespaceClone, kOrigin1, data1);
@@ -696,13 +698,13 @@ TEST_F(SessionStorageDatabaseTest, DeleteAreaWithShallowCopy) {
 TEST_F(SessionStorageDatabaseTest, WriteRawBytes) {
   // Write data which is not valid utf8 and contains null bytes.
   unsigned char raw_data[10] = {255, 0, 0, 0, 1, 2, 3, 4, 5, 0};
-  ValuesMap changes;
+  DOMStorageValuesMap changes;
   base::string16 string_with_raw_data;
   string_with_raw_data.assign(reinterpret_cast<char16*>(raw_data), 5);
   changes[kKey1] = base::NullableString16(string_with_raw_data, false);
   EXPECT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin1, false, changes));
   CheckDatabaseConsistency();
-  ValuesMap values;
+  DOMStorageValuesMap values;
   db_->ReadAreaValues(kNamespace1, kOrigin1, &values);
   const unsigned char* data =
       reinterpret_cast<const unsigned char*>(values[kKey1].string().data());
@@ -714,7 +716,7 @@ TEST_F(SessionStorageDatabaseTest, DeleteNamespaceConfusion) {
   // Regression test for a bug where a namespace with id 10 prevented deleting
   // the namespace with id 1.
 
-  ValuesMap data1;
+  DOMStorageValuesMap data1;
   data1[kKey1] = kValue1;
   ASSERT_TRUE(db_->CommitAreaChanges("foobar", kOrigin1, false, data1));
   ASSERT_TRUE(db_->CommitAreaChanges("foobarbaz", kOrigin1, false, data1));
@@ -724,7 +726,7 @@ TEST_F(SessionStorageDatabaseTest, DeleteNamespaceConfusion) {
 }
 
 TEST_F(SessionStorageDatabaseTest, ReadNamespaceIds) {
-  ValuesMap data1;
+  DOMStorageValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   data1[kKey3] = kValue3;
@@ -751,7 +753,7 @@ TEST_F(SessionStorageDatabaseTest, ReadNamespaceIdsInEmptyDatabase) {
 }
 
 TEST_F(SessionStorageDatabaseTest, ReadOriginsInNamespace) {
-  ValuesMap data1;
+  DOMStorageValuesMap data1;
   data1[kKey1] = kValue1;
   data1[kKey2] = kValue2;
   data1[kKey3] = kValue3;
@@ -780,10 +782,10 @@ TEST_F(SessionStorageDatabaseTest, ReadOriginsInNamespace) {
 
 TEST_F(SessionStorageDatabaseTest, DeleteAllOrigins) {
   // Write data for a namespace, for 2 origins.
-  ValuesMap data1;
+  DOMStorageValuesMap data1;
   data1[kKey1] = kValue1;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin1, false, data1));
-  ValuesMap data2;
+  DOMStorageValuesMap data2;
   data2[kKey1] = kValue2;
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin2, false, data2));
 
@@ -794,4 +796,4 @@ TEST_F(SessionStorageDatabaseTest, DeleteAllOrigins) {
 }
 
 
-}  // namespace dom_storage
+}  // namespace content