Unwire the clear on exit preference from the storage systems.

chrome/browser/net/sqlite_server_bound_cert_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/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 64 matching lines @@
             base::Time::FromInternalValue(1),
             base::Time::FromInternalValue(2),
             "a", "b"));
   }
 
   content::TestBrowserThread db_thread_;
   ScopedTempDir temp_dir_;
   scoped_refptr<SQLiteServerBoundCertStore> store_;
 };
 
-TEST_F(SQLiteServerBoundCertStoreTest, KeepOnDestruction) {
-  store_->SetClearLocalStateOnExit(false);
-  store_ = NULL;
-  // Make sure we wait until the destructor has run.
-  scoped_refptr<base::ThreadTestHelper> helper(
-      new base::ThreadTestHelper(
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)));
-  ASSERT_TRUE(helper->Run());
-
-  ASSERT_TRUE(file_util::PathExists(
-      temp_dir_.path().Append(chrome::kOBCertFilename)));
-  ASSERT_TRUE(file_util::Delete(
-      temp_dir_.path().Append(chrome::kOBCertFilename), false));
-}
-
-TEST_F(SQLiteServerBoundCertStoreTest, RemoveOnDestruction) {
-  store_->SetClearLocalStateOnExit(true);
-  // Replace the store effectively destroying the current one and forcing it
-  // to write its data to disk. Then we can see if after loading it again it
-  // is still there.
-  store_ = NULL;
-  // Make sure we wait until the destructor has run.
-  scoped_refptr<base::ThreadTestHelper> helper(
-      new base::ThreadTestHelper(
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)));
-  ASSERT_TRUE(helper->Run());
-
-  ASSERT_FALSE(file_util::PathExists(
-      temp_dir_.path().Append(chrome::kOBCertFilename)));
-}
-
 // Test if data is stored as expected in the SQLite database.
 TEST_F(SQLiteServerBoundCertStoreTest, TestPersistence) {
   store_->AddServerBoundCert(
       net::DefaultServerBoundCertStore::ServerBoundCert(
           "foo.com",
           net::CLIENT_CERT_ECDSA_SIGN,
           base::Time::FromInternalValue(3),
           base::Time::FromInternalValue(4),
           "c", "d"));
 
@@ skipping 415 matching lines @@
 // Tests the interaction with the clear on exit policy.
 // Crashes periodically on Mac 10.6
 // http://crbug.com/130511
 #if defined(OS_MACOSX)
 #define MAYBE_TestClearOnExitPolicy DISABLED_TestClearOnExitPolicy
 #else
 #define MAYBE_TestClearOnExitPolicy TestClearOnExitPolicy
 #endif
 TEST_F(SQLiteServerBoundCertStoreTest, MAYBE_TestClearOnExitPolicy) {
   // First, delete a possibly existing store.
-  store_->SetClearLocalStateOnExit(true);
   store_ = NULL;
   scoped_refptr<base::ThreadTestHelper> helper(
       new base::ThreadTestHelper(
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)));
   ASSERT_TRUE(helper->Run());
+  ASSERT_TRUE(file_util::Delete(
+      temp_dir_.path().Append(chrome::kOBCertFilename), false));
 
   // Create a new store with three certificates in it.
   store_ = new SQLiteServerBoundCertStore(
       temp_dir_.path().Append(chrome::kOBCertFilename), NULL);

[marja, 2012/05/31 15:30:32]

<unrelated whine>Instead of deleting the previous data, can't this test just use
a separate temp dir?</unrelated whine>

[jochen (gone - plz use gerrit), 2012/05/31 15:54:41]

will do

 
   ScopedVector<net::DefaultServerBoundCertStore::ServerBoundCert> certs;
   ASSERT_TRUE(store_->Load(&certs.get()));
   ASSERT_EQ(0U, certs.size());
 
   store_->AddServerBoundCert(
       net::DefaultServerBoundCertStore::ServerBoundCert(
           "other.com",
           net::CLIENT_CERT_RSA_SIGN,
           base::Time::FromInternalValue(1),
@@ skipping 24 matching lines @@
   scoped_refptr<ClearOnExitPolicy> clear_policy =
       new ClearOnExitPolicy(storage_policy.get());
   storage_policy->AddSessionOnly(GURL("https://session.com"));
   storage_policy->AddSessionOnly(GURL("https://protected.com"));
   storage_policy->AddProtected(GURL("https://protected.com"));
   store_ = new SQLiteServerBoundCertStore(
       temp_dir_.path().Append(chrome::kOBCertFilename), clear_policy.get());
   ASSERT_TRUE(store_->Load(&certs.get()));
   ASSERT_EQ(3U, certs.size());
 
-  // Delete the store. This should apply the clear on exit policy.
+  // We've put a exit policy in place, but force the state to be saved.
+  store_->SaveSessionState();
+  store_ = NULL;
+  ASSERT_TRUE(helper->Run());
+
+  // Reload the store and check that the certs are still there.
+  store_ = new SQLiteServerBoundCertStore(
+      temp_dir_.path().Append(chrome::kOBCertFilename), clear_policy.get());
+
+  // Reload and test for persistence
+  certs.reset();
+  ASSERT_TRUE(store_->Load(&certs.get()));
+  ASSERT_EQ(3U, certs.size());
+
+  // Delete the store. This time, the exit policy should be in place.
   store_ = NULL;
   // Make sure we wait until the destructor has run.
   ASSERT_TRUE(helper->Run());
 
   store_ = new SQLiteServerBoundCertStore(
       temp_dir_.path().Append(chrome::kOBCertFilename), clear_policy.get());
 
   // Reload and test for persistence
   certs.reset();
   ASSERT_TRUE(store_->Load(&certs.get()));
   ASSERT_EQ(2U, certs.size());
 
   ASSERT_TRUE(CertificateExistsInList(&certs.get(),
                                       "other.com",
                                       net::CLIENT_CERT_RSA_SIGN,
                                       "a", "b", 1, 2));
   ASSERT_TRUE(CertificateExistsInList(&certs.get(),
                                       "protected.com",
                                       net::CLIENT_CERT_RSA_SIGN,
                                       "n", "m", 5, 6));
 }