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, "", 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, "");
   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, "");
   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, "");
   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());
@@ skipping 19 matching lines @@
                            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, "", 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));
@@ skipping 290 matching lines @@
   EXPECT_EQ(
       FilePath().AppendASCII("-journal"),
       DomStorageDatabase::GetJournalFilePath(FilePath()));
   EXPECT_EQ(
       FilePath().AppendASCII(".extensiononly-journal"),
       DomStorageDatabase::GetJournalFilePath(
           FilePath().AppendASCII(".extensiononly")));
 }
 
 }  // namespace dom_storage