Unwire the clear on exit preference from the storage systems.

chrome/browser/net/sqlite_persistent_cookie_store_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/callback.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 100 matching lines @@
   content::TestBrowserThread db_thread_;
   content::TestBrowserThread io_thread_;
   base::WaitableEvent loaded_event_;
   base::WaitableEvent key_loaded_event_;
   base::WaitableEvent db_thread_event_;
   std::vector<net::CookieMonster::CanonicalCookie*> cookies_;
   ScopedTempDir temp_dir_;
   scoped_refptr<SQLitePersistentCookieStore> store_;
 };
 
-TEST_F(SQLitePersistentCookieStoreTest, KeepOnDestruction) {
-  InitializeStore(false);
-  // Put some data - any data - on disk, to have something to keep.
-  AddCookie("A", "B", "foo.bar", "/", base::Time::Now());
-  store_->SetClearLocalStateOnExit(false);
-  DestroyStore();
-
-  ASSERT_TRUE(file_util::PathExists(
-      temp_dir_.path().Append(chrome::kCookieFilename)));
-  ASSERT_TRUE(file_util::Delete(
-      temp_dir_.path().Append(chrome::kCookieFilename), false));
-}
-
-TEST_F(SQLitePersistentCookieStoreTest, RemoveOnDestruction) {
-  InitializeStore(false);
-  // Put some data - any data - on disk, to have something to remove.
-  AddCookie("A", "B", "foo.bar", "/", base::Time::Now());
-  store_->SetClearLocalStateOnExit(true);
-  DestroyStore();
-
-  ASSERT_FALSE(file_util::PathExists(
-      temp_dir_.path().Append(chrome::kCookieFilename)));
-}
-
 TEST_F(SQLitePersistentCookieStoreTest, TestInvalidMetaTableRecovery) {
   InitializeStore(false);
   AddCookie("A", "B", "foo.bar", "/", base::Time::Now());
   DestroyStore();
 
   // Load up the store and verify that it has good data in it.
   std::vector<net::CookieMonster::CanonicalCookie*> cookies;
   CreateAndLoad(false, &cookies);
   ASSERT_EQ(1U, cookies.size());
   ASSERT_STREQ("foo.bar", cookies[0]->Domain().c_str());
@@ skipping 355 matching lines @@
   t += base::TimeDelta::FromInternalValue(10);
   AddCookie("C", "3", other_origin, "/", t);
   // A secure cookie on session_origin.
   t += base::TimeDelta::FromInternalValue(10);
   store_->AddCookie(
       net::CookieMonster::CanonicalCookie(GURL(), "D", "4", session_origin, "/",
                                           std::string(), std::string(),
                                           t, t, t,
                                           true, false, true, true));
 
+  // First, check that we can override the policy.
+  store_->SetForceKeepSessionState();
+
   // Force the store to write its data to the disk.
   DestroyStore();
 
   // Create a store test that the cookie on session_origin does not exist.
   store_ = new SQLitePersistentCookieStore(
       temp_dir_.path().Append(chrome::kCookieFilename),
       false,
       clear_policy.get());
   Load(&cookies);
 
+  EXPECT_EQ(4U, cookies.size());
+  EXPECT_TRUE(IsCookiePresent(&cookies, protected_origin, "A", "1", false));
+  EXPECT_TRUE(IsCookiePresent(&cookies, session_origin, "B", "2", false));
+  EXPECT_TRUE(IsCookiePresent(&cookies, other_origin, "C", "3", false));
+  EXPECT_TRUE(IsCookiePresent(&cookies, session_origin, "D", "4", true));
+
+  // This time, the clear on exit policy should be in effect.
+  DestroyStore();
+
+  // Create a store test that the cookie on session_origin does not exist.
+  store_ = new SQLitePersistentCookieStore(
+      temp_dir_.path().Append(chrome::kCookieFilename),
+      false,
+      clear_policy.get());
+  Load(&cookies);
+
   EXPECT_EQ(3U, cookies.size());
   EXPECT_TRUE(IsCookiePresent(&cookies, protected_origin, "A", "1", false));
   EXPECT_TRUE(IsCookiePresent(&cookies, other_origin, "C", "3", false));
   EXPECT_TRUE(IsCookiePresent(&cookies, session_origin, "D", "4", true));
 
   DestroyStore();
 }