Create and store persistent unique ids for sessionStorage.

webkit/dom_storage/dom_storage_area_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/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/scoped_temp_dir.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ skipping 52 matching lines @@
       EXPECT_EQ(kValue, values[kKey].string());
     }
   };
 
  private:
   MessageLoop message_loop_;
 };
 
 TEST_F(DomStorageAreaTest, DomStorageAreaBasics) {
   scoped_refptr<DomStorageArea> area(
-      new DomStorageArea(1, kOrigin, FilePath(), NULL));
+      new DomStorageArea(1, std::string(), kOrigin, NULL));
   string16 old_value;
   NullableString16 old_nullable_value;
   scoped_refptr<DomStorageArea> copy;
 
   // We don't focus on the underlying DomStorageMap functionality
   // since that's covered by seperate unit tests.
   EXPECT_EQ(kOrigin, area->origin());
   EXPECT_EQ(1, area->namespace_id());
   EXPECT_EQ(0u, area->Length());
   EXPECT_TRUE(area->SetItem(kKey, kValue, &old_nullable_value));
   EXPECT_TRUE(area->SetItem(kKey2, kValue2, &old_nullable_value));
   EXPECT_FALSE(area->HasUncommittedChanges());
 
   // Verify that a copy shares the same map.
-  copy = area->ShallowCopy(2);
+  copy = area->ShallowCopy(2, std::string());
   EXPECT_EQ(kOrigin, copy->origin());
   EXPECT_EQ(2, copy->namespace_id());
   EXPECT_EQ(area->Length(), copy->Length());
   EXPECT_EQ(area->GetItem(kKey).string(), copy->GetItem(kKey).string());
   EXPECT_EQ(area->Key(0).string(), copy->Key(0).string());
   EXPECT_EQ(copy->map_.get(), area->map_.get());
 
   // But will deep copy-on-write as needed.
   EXPECT_TRUE(area->RemoveItem(kKey, &old_value));
   EXPECT_NE(copy->map_.get(), area->map_.get());
-  copy = area->ShallowCopy(2);
+  copy = area->ShallowCopy(2, std::string());
   EXPECT_EQ(copy->map_.get(), area->map_.get());
   EXPECT_TRUE(area->SetItem(kKey, kValue, &old_nullable_value));
   EXPECT_NE(copy->map_.get(), area->map_.get());
-  copy = area->ShallowCopy(2);
+  copy = area->ShallowCopy(2, std::string());
   EXPECT_EQ(copy->map_.get(), area->map_.get());
   EXPECT_NE(0u, area->Length());
   EXPECT_TRUE(area->Clear());
   EXPECT_EQ(0u, area->Length());
   EXPECT_NE(copy->map_.get(), area->map_.get());
 
   // Verify that once Shutdown(), behaves that way.
   area->Shutdown();
   EXPECT_TRUE(area->is_shutdown_);
   EXPECT_FALSE(area->map_.get());
   EXPECT_EQ(0u, area->Length());
   EXPECT_TRUE(area->Key(0).is_null());
   EXPECT_TRUE(area->GetItem(kKey).is_null());
   EXPECT_FALSE(area->SetItem(kKey, kValue, &old_nullable_value));
   EXPECT_FALSE(area->RemoveItem(kKey, &old_value));
   EXPECT_FALSE(area->Clear());
 }
 
 TEST_F(DomStorageAreaTest, BackingDatabaseOpened) {
   const int64 kSessionStorageNamespaceId = kLocalStorageNamespaceId + 1;
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   const FilePath kExpectedOriginFilePath = temp_dir.path().Append(
       DomStorageArea::DatabaseFileNameFromOrigin(kOrigin));
 
   // No directory, backing should be null.
   {
     scoped_refptr<DomStorageArea> area(
-        new DomStorageArea(kLocalStorageNamespaceId, kOrigin, FilePath(),
-                           NULL));
+        new DomStorageArea(kOrigin, FilePath(), NULL));
     EXPECT_EQ(NULL, area->backing_.get());
     EXPECT_TRUE(area->is_initial_import_done_);
     EXPECT_FALSE(file_util::PathExists(kExpectedOriginFilePath));
   }
 
   // Valid directory and origin but non-local namespace id. Backing should
   // be null.
   {
     scoped_refptr<DomStorageArea> area(
-        new DomStorageArea(kSessionStorageNamespaceId, kOrigin,
-                           temp_dir.path(), NULL));
+        new DomStorageArea(kSessionStorageNamespaceId, std::string(), kOrigin,
+                           NULL));
     EXPECT_EQ(NULL, area->backing_.get());
     EXPECT_TRUE(area->is_initial_import_done_);
 
     NullableString16 old_value;
     EXPECT_TRUE(area->SetItem(kKey, kValue, &old_value));
     ASSERT_TRUE(old_value.is_null());
 
     // Check that saving a value has still left us without a backing database.
     EXPECT_EQ(NULL, area->backing_.get());
     EXPECT_FALSE(file_util::PathExists(kExpectedOriginFilePath));
   }
 
   // This should set up a DomStorageArea that is correctly backed to disk.
   {
     scoped_refptr<DomStorageArea> area(
-        new DomStorageArea(kLocalStorageNamespaceId, kOrigin,
+        new DomStorageArea(kOrigin,
             temp_dir.path(),
             new MockDomStorageTaskRunner(base::MessageLoopProxy::current())));
 
     EXPECT_TRUE(area->backing_.get());
     EXPECT_FALSE(area->backing_->IsOpen());
     EXPECT_FALSE(area->is_initial_import_done_);
 
     // Inject an in-memory db to speed up the test.
     // We will verify that something is written into the database but not
     // that a file is written to disk - DOMStorageDatabase unit tests cover
@@ skipping 22 matching lines @@
     EXPECT_EQ(1u, values.size());
     EXPECT_EQ(kValue, values[kKey].string());
   }
 }
 
 TEST_F(DomStorageAreaTest, CommitTasks) {
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   scoped_refptr<DomStorageArea> area(
-      new DomStorageArea(kLocalStorageNamespaceId, kOrigin,
+      new DomStorageArea(kOrigin,
           temp_dir.path(),
           new MockDomStorageTaskRunner(base::MessageLoopProxy::current())));
   // Inject an in-memory db to speed up the test.
   area->backing_.reset(new DomStorageDatabase());
 
   // Unrelated to commits, but while we're here, see that querying Length()
   // causes the backing database to be opened and presumably read from.
   EXPECT_FALSE(area->is_initial_import_done_);
   EXPECT_EQ(0u, area->Length());
   EXPECT_TRUE(area->is_initial_import_done_);
@@ skipping 56 matching lines @@
   area->backing_->ReadAllValues(&values);
   EXPECT_EQ(2u, values.size());
   EXPECT_EQ(kValue, values[kKey].string());
   EXPECT_EQ(kValue2, values[kKey2].string());
 }
 
 TEST_F(DomStorageAreaTest, CommitChangesAtShutdown) {
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   scoped_refptr<DomStorageArea> area(
-      new DomStorageArea(kLocalStorageNamespaceId, kOrigin,
+      new DomStorageArea(kOrigin,
           temp_dir.path(),
           new MockDomStorageTaskRunner(base::MessageLoopProxy::current())));
 
   // Inject an in-memory db to speed up the test and also to verify
   // the final changes are commited in it's dtor.
   area->backing_.reset(new VerifyChangesCommittedDatabase());
 
   ValuesMap values;
   NullableString16 old_value;
   EXPECT_TRUE(area->SetItem(kKey, kValue, &old_value));
   EXPECT_TRUE(area->HasUncommittedChanges());
   area->backing_->ReadAllValues(&values);
   EXPECT_TRUE(values.empty());  // not committed yet
   area->Shutdown();
   MessageLoop::current()->RunAllPending();
   EXPECT_TRUE(area->HasOneRef());
   EXPECT_FALSE(area->backing_.get());
   // The VerifyChangesCommittedDatabase destructor verifies values
   // were committed.
 }
 
 TEST_F(DomStorageAreaTest, DeleteOrigin) {
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   scoped_refptr<DomStorageArea> area(
-      new DomStorageArea(kLocalStorageNamespaceId, kOrigin,
+      new DomStorageArea(kOrigin,
           temp_dir.path(),
           new MockDomStorageTaskRunner(base::MessageLoopProxy::current())));
 
   // This test puts files on disk.
   FilePath db_file_path = area->backing_->file_path();
   FilePath db_journal_file_path =
       DomStorageDatabase::GetJournalFilePath(db_file_path);
 
   // Nothing bad should happen when invoked w/o any files on disk.
   area->DeleteOrigin();
@@ skipping 39 matching lines @@
   EXPECT_TRUE(file_util::PathExists(db_file_path));
   area->Shutdown();
   MessageLoop::current()->RunAllPending();
   EXPECT_FALSE(file_util::PathExists(db_file_path));
 }
 
 TEST_F(DomStorageAreaTest, PurgeMemory) {
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   scoped_refptr<DomStorageArea> area(
-      new DomStorageArea(kLocalStorageNamespaceId, kOrigin,
+      new DomStorageArea(kOrigin,
           temp_dir.path(),
           new MockDomStorageTaskRunner(base::MessageLoopProxy::current())));
 
   // Inject an in-memory db to speed up the test.
   area->backing_.reset(new DomStorageDatabase());
 
   // Unowned ptrs we use to verify that 'purge' has happened.
   DomStorageDatabase* original_backing = area->backing_.get();
   DomStorageMap* original_map = area->map_.get();
 
@@ skipping 68 matching lines @@
   EXPECT_EQ(
       FilePath().AppendASCII("-journal"),
       DomStorageDatabase::GetJournalFilePath(FilePath()));
   EXPECT_EQ(
       FilePath().AppendASCII(".extensiononly-journal"),
       DomStorageDatabase::GetJournalFilePath(
           FilePath().AppendASCII(".extensiononly")));
 }
 
 }  // namespace dom_storage