Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Unified Diff: webkit/dom_storage/dom_storage_area_unittest.cc

Issue 10546167: Create and store persistent unique ids for sessionStorage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/dom_storage/dom_storage_area_unittest.cc
diff --git a/webkit/dom_storage/dom_storage_area_unittest.cc b/webkit/dom_storage/dom_storage_area_unittest.cc
index f9d428474cb6da97e3496453a4fac3678d8fedff..ee64623df6ddf0e490f5ebe729eb501f7f6e25ef 100644
--- a/webkit/dom_storage/dom_storage_area_unittest.cc
+++ b/webkit/dom_storage/dom_storage_area_unittest.cc
@@ -70,7 +70,7 @@ class DomStorageAreaTest : public testing::Test {
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;
@@ -85,7 +85,7 @@ TEST_F(DomStorageAreaTest, DomStorageAreaBasics) {
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());
@@ -96,11 +96,11 @@ TEST_F(DomStorageAreaTest, DomStorageAreaBasics) {
// 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());
@@ -140,8 +140,7 @@ TEST_F(DomStorageAreaTest, BackingDatabaseOpened) {
// 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_);

Powered by Google App Engine
This is Rietveld 408576698