SessionRestore: Store session cookies and restore them if chrome crashes or auto-restarts.

net/base/cookie_monster_unittest.cc

Index: net/base/cookie_monster_unittest.cc
diff --git a/net/base/cookie_monster_unittest.cc b/net/base/cookie_monster_unittest.cc
index ce8d9ae29c5d4095e413c0149af5a019d2a8132e..0ae6e9d07ae98b16ee57a0bab0150a13b855c0fe 100644
--- a/net/base/cookie_monster_unittest.cc
+++ b/net/base/cookie_monster_unittest.cc
@@ -3579,4 +3579,42 @@ TEST_F(CookieMonsterTest, InvalidExpiryTime) {
   ASSERT_FALSE(cookie->DoesExpire());
 }
 
+// Test that CookieMonster writes session cookies into the underlying
+// CookieStore if the "persist session cookies" option is on.
+TEST_F(CookieMonsterTest, PersistSessionCookies) {
+  scoped_refptr<MockPersistentCookieStore> store(
+      new MockPersistentCookieStore);
+  scoped_refptr<CookieMonster> cm(new CookieMonster(store, NULL));
+  cm->SetPersistSessionCookies(true);

[jochen (gone - plz use gerrit), 2011/11/30 12:12:17]

what happens if you set this option after there is already a session cookie in
the monster?

[marja, 2011/11/30 12:57:48]

Added DCHECK(!initialized_) to SetPersistSessionCookies.

+
+  // All cookies set with SetCookie are session cookies.
+  EXPECT_TRUE(SetCookie(cm, url_google_, "A=B"));
+  EXPECT_EQ("A=B", GetCookies(cm, url_google_));
+
+  // The cookie was written to the backing store.
+  EXPECT_EQ(1u, store->commands().size());
+  EXPECT_EQ(CookieStoreCommand::ADD, store->commands()[0].type);
+  EXPECT_EQ("A", store->commands()[0].cookie.Name());
+  EXPECT_EQ("B", store->commands()[0].cookie.Value());
+
+  // Modify the cookie.
+  EXPECT_TRUE(SetCookie(cm, url_google_, "A=C"));
+  EXPECT_EQ("A=C", GetCookies(cm, url_google_));
+  EXPECT_EQ(3u, store->commands().size());
+  EXPECT_EQ(CookieStoreCommand::REMOVE, store->commands()[1].type);
+  EXPECT_EQ("A", store->commands()[1].cookie.Name());
+  EXPECT_EQ("B", store->commands()[1].cookie.Value());
+  EXPECT_EQ(CookieStoreCommand::ADD, store->commands()[2].type);
+  EXPECT_EQ("A", store->commands()[2].cookie.Name());
+  EXPECT_EQ("C", store->commands()[2].cookie.Value());
+
+  // Delete the cookie.
+  DeleteCookie(cm, url_google_, "A");
+  EXPECT_EQ("", GetCookies(cm, url_google_));
+  EXPECT_EQ(4u, store->commands().size());
+  EXPECT_EQ(CookieStoreCommand::REMOVE, store->commands()[3].type);
+  EXPECT_EQ("A", store->commands()[3].cookie.Name());
+  EXPECT_EQ("C", store->commands()[3].cookie.Value());
+}
+
 }  // namespace net